Much of the complex parts of git have to do with rebasing and merging. But I remember that Pre-git this was hard too - the lack of features in VCS systems mad

Much of the complex parts of git have to do with rebasing and merging. But I remember that Pre-git this was hard too - the lack of features in VCS systems made it rather error prone. I recall manual 3-way merges and long conversations with colleagues about the right way to work through an SVN merge. Not to mention automated testing was less widespread, so it was harder to catch bugs. Git offers more features here. But the truth is the problem is just hard. Combining changes from multiple authors requires knowing both your tooling and code well.