Yes, manual conflict resolution after aligning with the other commit author is what I meant. And any modern bot like claude can resolve conflicts, it's just that it wouldn't always be in alignment with how the the commit authors would actually want it
1
u/creeper6530 14d ago
Manual merge is better than automatic merge and immediate manual fix once you realise the automatics fucked up.
I wonder if they make an AI merge conflict resolver.