News for hackers. Stuff that matters.
Re:Unified versus Split Diff by fanf2 on Tuesday October 24, 2023 @01:42PM (#38002561)
Git’s merge algorithm looks at three versions of the code: the two branch tips being merged, and their common ancestor. It might be better at resolving conflicts if it looked at some of the intermediate commits as well, but I don’t know of anything that does so.

There are no comments on this comment yet.