5. Resolving merge conflicts is easier. This one only dawned on me recently. Perhaps my brain had put it down to just getting better at unpicking a merge conflict when rebasing, but on reflection a large part can be attributed to my commits being smaller and more atomic.
