3 ms·
git is the solution, not the problem.
by eisbaw 1y ago
git is the solution, not the problem.
- doublerabbit 1y agogit is the solution to a even bigger problem.
- amelius 1y agountil you have merge conflicts
- mbeavitt 1y agoMerge conflicts are a blessing - they tell us exactly what the problem is...
- amelius 1y agoBut 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.
- _rutinerad 1y agoNow you have n problems.
- theandrewbailey 1y agogit is the solution for code collaboration, but not for document collaboration.
- NoGravitas 1y agoOnly because we don't have: 1. A good enough diff/merge tool for common non-text documents 2. A good enough interface to git