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