Comment by yegle

No worries, it's still just another commit w/ conflict. If you want, solve those conflicts later.

Why is git's "forced conflict resolution" better, assuming the same workflow (local change+sync upstream) would produce the same # of conflicted commits?