3 ms·
The reason is that you have two chunks of code (possibly arbitrarily delimited). You know from the regular two-part conflict marker that developer A wants the
by kazinator 5y ago
The reason is that you have two chunks of code (possibly arbitrarily delimited).
You know from the regular two-part conflict marker that developer A wants the code one way, and B wants it some other way. Often that is quite easy to understand and resolve.
But sometimes it's useful to know the original: what is it that A and B started with, to produce those divergent sections of code?
That may be helpful.
It might not. For one thing, suppose the rest of the code merged. That means that in the rest of the code you don't see anything original.
You could end up with:
<<<<<<<
new_function_x();
========
new_function_y();
||||||||
function_that_no_longer_exists();
>>>>>>>>
OK, the original was a function that no longer exists; and since this is the only conflict, you can't find that function anywhere unless you go digging into history out-of-band.
A and B both deleted the function, and that didn't conflict. Nice to know, but the definition of it isn't present to know what it does.
In other kinds of situations, it may be useful.