Kevin Bracey <ke...@bracey.fi> writes:
> I disagree here. At the minute, it does set ret to 1 (but further down
> the code - bringing it up here next to the "ERROR" print clarifies
> that), and will report the merge as failed, conflict in the 3-way
> merge or not. Which I think is correct.
OK. I agree that forcing users to always inspect the result of
"both side added" resolution sounds like a good safety measure.
> Maybe the virtual base itself should be different. Maybe it should put
> a ??????? marker in place of every unique line. So you get:
> Left ABCEFGH
> Right XABCDEFJH -> Merge result <|X>ABC<|D>EF<G|J>H
> VBase ?ABC?EF??H
> That actually feels like it may be the correct answer here.
Interesting, though the approach has downsides with the diff3
conflict style, no?
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