Johannes Sixt wrote: > Am 11.06.21 um 08:43 schrieb Junio C Hamano: > > Rebasing to catch up with updated upstream is a different story, > > though. The same for cherry-picking an earlier change to an updated > > upstream. > > I've reflected on this a bit more as well. I've forgotten about the > "catch up with someone else" case. That is certainly helped by diff3 > style. I retract my opposition and am now neutral to a potential change > of default. (I still don't endorse it because it upsets my workflow.) All right. Fortunately we have a configuration for that. > The case that inner conflicts are presented sub-optimally under diff3 > remains, though. Indeed, and that's something that we should consider fixing, but it's not necessarily a roadblocker since apparently many developers have been able to live with these sub-optimal diff3 inner conflicts. Personally I have never experienced what you posted, so maybe there's something else happening behind the scenes. Maybe merge-ort changed something. -- Felipe Contreras
