This is something git shares with pretty much every source code management system. Of the ones I’ve used over the years including SVN, PVCS, whatever that janky little Microsoft one was called and even sccs in the old days, they all sucked one way or another.

The only one that was truly intuitive to me was Envy/Developer. It only really made sense because we used it in Smalltalk but I really liked the packaged nature of change sets that it modeled.

Git is nowhere near the worst of these. SVN, hands down a cranky and unreliable dumpster fire was the worst.

With git at least you can get way with using a surprisingly small subset of features if you regularly merge before doing your pull request.

/thread