It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there were attempts to solve the same conflict in 2 different ways. Needless to say, that will be the exception to the rule. For the others on this … Read more
If you do a merge incorrectly, then discard it, then do the “same” merge again, it will be incorrect again. You can forget a recorded resolution, though. From the documentation: git rerere forget <pathspec> This resets the conflict resolutions which rerere has recorded for the current conflict in <pathspec>. Be careful to use it on … Read more
What is git rerere? As the documentation notes, rerere stands for reuse recorded resolution. That doesn’t really explain what it is, though. It’s worth adding first, here, that git rerere itself—the command—is not something you have to run. It has just six subcommands: clear, forget, diff, status, remaining, and gc. None of these record or … Read more