WIP: ``Fix merge --no-ff``

git-school / visualizing-git

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

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

MIT License

1.25k stars 193 forks source link

Open IanLee1521 opened 7 years ago

IanLee1521 commented 7 years ago

Work in progress at fixing #83

So far I have fixed the short case, but broken the previous working case...

hollenberry commented 6 years ago

👋 @IanLee1521 ! Any luck with this since your last update? Just ran into the same bug myself while working on a demo.

IanLee1521 commented 6 years ago

I haven't, not, but I need to circle back and resolve this and a few other issues. Would be happy to take help over at: https://github.com/ianlee1521/visualizing-git/tree/gh-83-merge-no-ff to try to get to a final working PR though!