Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > So what about > > <<<<<<< This hunk contains ===== > anythin > ======= > > Hello > ======= > somethin else > >>>>>>> problem! > > > If you fix it, I think you should do it properly, and analyze the index. I do not know offhand if analyzing the index is the right solution, but your point is very valid. You need to know which ====== is the real one to be able to properly flip sides of the conflict. I however think detecting that we have this ambiguous hunk is easy, and punting gracefully and not re-resolving in such a case is million times better than producing random results that the users need to be worried about. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
