3 ms·
Can it resolve merge conflicts for me? My least favorite programming task and one I haven't seen automated yet.
by modeless 1y ago
Can it resolve merge conflicts for me? My least favorite programming task and one I haven't seen automated yet.
- mock-possum 1y agoI’d love to see it if that’s possible - merge conflict cleanup can be some of the hardest calls, imo, particularly when the ‘right’ merge is actually a hybridized block that contains elements from both theirs and mine. I feel like introducing today’s LLM into the process would only end up making things harder to untangle.
- juddlyon 1y agoClaude Code has been creating and cleaning up lots of Git messes for me.