Skip to content

Can't run merge --no-ff if there aren't enough commit #83

Open
Open
Can't run merge --no-ff if there aren't enough commit#83

Description

@BinaryMuse
BinaryMuse
opened on Sep 13, 2016

Logic in HistoryView runs off the left edge of the commit graph causing errors; as long as the branch being merged is at least 3 commits in, --no-ff works fine.

Activity

  1. IanLee1521 commented on Jul 9, 2017

    @IanLee1521
    IanLee1521
    on Jul 9, 2017
    Contributor

    Just found this myself. Seems to be the code bit here: https://github.com/git-school/visualizing-git/blob/gh-pages/js/historyview.js#L1419

  2. IanLee1521
    added a commit that references this issue on Jul 9, 2017

    WIP: git-school#83 add support for --no-ff with few commits

    bd8c288

  3. Conmiro commented on Dec 28, 2018

    @Conmiro
    Conmiro
    on Dec 28, 2018

    I'm seeing this issue as well with same precondition.

  4. rcmarques3
    added a commit that references this issue on May 22, 2022

    Merge pull request #3 from udovicic/bugfix/git-school#83-merge-issue

    1eacf43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions