That's true, but it's possible to imagine a system superior to git solving this in someway, in the same way that git solves distributed merges.