4 ms·
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 reb
by jwilliams 7mo ago
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.
- layer8 7mo agoCode not compiling is still the good case, because you’ll notice before deployment. The dangerous cases are when it does compile.
- jwilliams 7mo agoVery 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.
- Gibbon1 7mo agoI've seen merged code where the memory barriers were misplaced.
- skydhash 7mo agoI'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).