On Wed, Apr 24, 2013 at 7:48 AM, Junio C Hamano <gits...@pobox.com> wrote: > there > could be textual conflicts and you could choose to leave them in, or > you could choose to have rerere resolve it. As long as you do the > same when replaying this prepackaged evil merge, this choice does > not matter, but using rerere will make your life easier
The problem is that rerere can not be easily shared, and I'm afraid it would be almost impossible to go without it (do you commit N with conflict markers hoping that F' will remove them?). But, as it looks like you would save F on top of M, it means that M would be reachable, and thus rerere would be "recomputable" from somewhere else. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
