Re:Rewrite Git history via drag-and-drop
by lzzzam on Tuesday December 03, 2024 @10:50AM
(#42307459)
QUESTION: How does this handle merge conflict when rewriting the history??
[ Parent
| on HN ]
Re:Rewrite Git history via drag-and-drop
by Cykelero on Tuesday December 03, 2024 @04:27PM
(#42311689)
If there's a conflict, Retcon shows that to you, but you can keep freely moving commits around—it's not blocking.
Once you're happy with how your history looks like, you can start actually resolving any remaining conflicts, and after that the history gets actually written.
Sometimes, just moving things around further is enough to resolve the conflicts, too, if they're simple enough!