logoalt Hacker News

jwilliamstoday at 5:53 PM2 repliesview on HN

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.


Replies

layer8today at 5:55 PM

Code not compiling is still the good case, because you’ll notice before deployment. The dangerous cases are when it does compile.

show 2 replies
skydhashtoday at 6:01 PM

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).