News for hackers. Stuff that matters.
Re:A Coherent Vision for the Future of Version Control by jwilliams on Sunday March 22, 2026 @01:53PM (#47480173)
Indeed. And plenty of successful merges end up with code that won't compile.

FWIW I've struggled to get AI tools to handle merge conflicts well (especially rebase) for the same underlying reason.

Re:A Coherent Vision for the Future of Version Control by layer8 on Sunday March 22, 2026 @01:55PM (#47480191)
Code not compiling is still the good case, because you’ll notice before deployment. The dangerous cases are when it does compile.
Re:A Coherent Vision for the Future of Version Control by jwilliams on Sunday March 22, 2026 @02:05PM (#47480299)
Very true.

I realized recently that I've subconsciously routed-around merge conflicts as much as possible. My process has just subtly altered to make them less likely. To the point of which seeing a 3-way merge feels jarring. It's really only taking on AI tools that bought this to my attention.

Re:A Coherent Vision for the Future of Version Control by Gibbon1 on Sunday March 22, 2026 @05:23PM (#47482294)
I've seen merged code where the memory barriers were misplaced.
Re:A Coherent Vision for the Future of Version Control by skydhash on Sunday March 22, 2026 @02:01PM (#47480255)
I'm surprised to see that some people sync their working tree and does not evaluate their patch again (testing and reviewing the assumptions they have made for their changes).