upvote
Squash commit can fix the conflict.
reply
Doesn't work if there are too many diffs
reply
deleted
reply
Diffs can always be patched up.
reply