News for hackers. Stuff that matters.
Re:A Coherent Vision for the Future of Version Control by Androider on Sunday March 22, 2026 @07:52PM (#47483651)
I've had really good success lately with having Claude Code resolve conflicts, to the point that I don't see myself doing manual resolutions going forward.

Set git.conflictStyle to zdiff3 and ask Claude to resolve the conflict, or even better, complete the entire rebase for you. A quick diff sanity check against the merge base of the result takes just a few seconds.

Re:A Coherent Vision for the Future of Version Control by mememememememo on Sunday March 22, 2026 @08:06PM (#47483765)
Thanks literally just used this!