I’m pretty sure the same operation without Git (or another VCS) would be infinitely more troublesome, not less.

dude was frustrated, he quit and became a farmer

This is why I use darcs. VCSs based on patch theory have less conflicts.