[mbeavitt]

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

[amelius]

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.