3 ms·
This was really well written, and I loved the visualizations too - I wouldn't have grasped it nearly as quickly without them. This very much reminds of of merg
by fire 5y ago
This was really well written, and I loved the visualizations too - I wouldn't have grasped it nearly as quickly without them.
This very much reminds of of merged-based-rebasing[1] aka psycho-rebasing[2] (which itself became part of git-extras[3]; Have you seen the concept before?
--
1: https://tech.people-doc.com/merging-the-right-way.html https://tech.people-doc.com/merging-the-right-way.html
2: https://tech.people-doc.com/psycho-rebasing.html https://tech.people-doc.com/psycho-rebasing.html
3: https://github.com/tj/git-extras/blob/1894f453f696720111723043f410437df7aa14b5/man/git-psykorebase.md https://github.com/tj/git-extras/blob/1894f453f6967201117230...