4 ms·
This sounds like an intractable problem, and putting it politely, the fault lies in the file format, not the VCS.
by npsimons 6y ago
This sounds like an intractable problem, and putting it politely, the fault lies in the file format, not the VCS.
- Lichtso 6y agoYou are right, in that it is very hard. That is why I said that I think distributed VCS is far from being solved. However, I think the "fault" lies neither in the VCS nor file format. It simply shows that merging requires domain knowledge and that future VCS will need to cooperate with file formats to achieve that.