The ability to resolve merge conflicts one part at a time is a game changer itself. > A force-push to trunk breaks every other developer's working copy. Only

The ability to resolve merge conflicts one part at a time is a game changer itself. > A force-push to trunk breaks every other developer's working copy. Only if they pull your broken trunk as well. Otherwise you're just wrong. > A rebase may unintentionally overwrite someone's work. No only your copy of someone's work.