Now you have n problems.

git is the solution for code collaboration, but not for document collaboration.

Only because we don't have:

1. A good enough diff/merge tool for common non-text documents 2. A good enough interface to git

git is the solution to a even bigger problem.

until you have merge conflicts

Merge conflicts are a blessing - they tell us exactly what the problem is...

But if you recorded the intent of the editing operation, there wouldn't be a problem in the first place.

The problem with git is that it has to do a 3-way merge. But there is much more data. Basically every keypress can be recorded and taken into consideration by the merge algorithm.