Have you ever ran into the problem where you seem to be resolving the same merge conflicts over and over in git? Have you gotten tired of resolving them the same way each time? Git already has the answer for you, git rerere. This command will allow you to record git merge conflict resolutions, and then git will automagically apply them for you if it runs into the same conflict! This is pretty magical and I hadn’t found out about it until a few coworkers ended up resolving the same conflicts over and over again. I did a quick bit of googling and found rerere.
Rerere actually stands for "reuse recorded resolution" and can help save you time if you’re stuck resolving that same darned conflict more than once.
In a nutshell you can enable it via git config --global rerere.enabled true and it will automatically save conflict resolutions and attempt to reapply them for you. Sometimes you don’t want these resolutions to be reapplied, so either disable rerere, or, you can checkout the conflicted version of a file after a merge that was resolved via rerere via git checkout --conflict=merge file.txt You could then resolve the conflict in some other fashion.
