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
Repro steps: