News for hackers. Stuff that matters.
Re:Unified versus Split Diff by grotorea on Tuesday October 24, 2023 @12:24PM (#38001439)
Interesting. Wonder if something like that can be used to make git cleverer about merges for example.
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.
Re:Unified versus Split Diff by ilyt on Tuesday October 24, 2023 @07:52PM (#38007353)
Merge part isn't pluggable like that IIRC. Would be interesting if that was given stable interface, then supposed "smart merge" tool could iterate with few ways to merge code while running tests to check which one produces least/no errors