3 ms·
An AST based conflict resolver could eliminate the same kind of merge conflicts on a text based RCS
by micw 7mo ago
An AST based conflict resolver could eliminate the same kind of merge conflicts on a text based RCS
- ibejoeb 7mo agoYeah I suppose that's true, too. You've got to do the conversion at some point. I don't know that you get any benefit of doing storing the text, doing the transformation to support whatever ops (deconflicting, etc.) and then transforming back to text again vs just storing it in the intermediate format. Ideally, this would all be transparent to the user anyway.
- gritzko 7mo agoFor one merge, yes. The fun starts when you have a sequence of merges. CRDTs put ids on tokens, so things are a bit more deterministic. Imagine a variable rename or a whitespace change; it messes text diffing completely.