git-school / visualizing-git

:framed_picture: Visualize how common Git operations affect the commit graph

Home Page:http://git-school.github.io/visualizing-git/

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

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

BinaryMuse opened this issue · comments

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.

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