My favorite git utility is "reuse recorded resolution" git rerere. Sometimes if you have multiple parallel branches and try to merge or rebase between them, you get the same conflict multiple times. git rerere records your resolution and then just automatically applies it, if you encounter the same conflict again.
And it's pretty much set it and forget it because it completely works autonomously in the background. git-scm.com/docs/git-rerere
My favorite git utility is "reuse recorded resolution"
git rerere. Sometimes if you have multiple parallel branches and try to merge or rebase between them, you get the same conflict multiple times.git rerererecords your resolution and then just automatically applies it, if you encounter the same conflict again.And it's pretty much set it and forget it because it completely works autonomously in the background. git-scm.com/docs/git-rerere
I never heard about this one until now. It looks very handy! I'll give a try on my next conflict!
Thanks for sharing 👍