search

onlywei / explain-git-with-d3

Use D3 to visualize simple git branching operations.
MIT License
1.71k stars 389 forks source link

Javascript error with "no-ff" merge #49

Open tomasfejfar opened 8 years ago

tomasfejfar commented 8 years ago

When I try to show no-ff merge I get (tried both positions):

git merge --no-ff master
Cannot read property 'parent' of null
git merge master --no-ff
Cannot read property 'parent' of null

image

kheyse-werk commented 6 years ago

What you are trying to do is merge an older commit into a newer commit where the older commit is a direct ancestor of the newer commit. Git would tell you "Already up to date." when you do that.