Git provides a helpful argument to prefer one branch or the other to “clobber” merge conflicts:
git merge main -Xours
git merge main -XtheirsI always get confused what the “X” means. I always assume “X” means mark which branch to clobber. Like “X” out their branch. Or “X” out our branch. Please wipe this mnemonic from your brain!
“X” means “PREFER”
“PREFER” the changes in their branch (-Xtheirs) or “PREFER” the changes in our branch (-Xours).
Jeez!