:bug: git merge --no-ff branch

[Katrina Uychaco]

Repro steps:

git commit (2x)
git checkout -b branch
git commit (2x)
git checkout master
git commit (3x)
git merge branch
git reset --hard [last commit]
git checkout branch
git merge master
git checkout master
git merge branch
git reset --hard [last commit]
git merge -no-ff branch
// Cannot read property 'parent' of null

[Linda]

@kuychaco I got the same error when I tried to do a git merge feature1 --no-ff after testing a straight-up git merge feature1!

[Harleen Mann]

getting the same issue

[Bora Lee]

following the issue.

[sidhant singh]

got the same issue today