16 ms·
Also note that our use case is much simpler. The programming language tells you whether your merge created a valid document.
by stephbook 7mo ago
Also note that our use case is much simpler. The programming language tells you whether your merge created a valid document.
- torginus 7mo agoI've never seen that information actually being used in any merge tool, with the notable exception of Visual Studio/C# (where you get symbol resolution for the merged doc, but even there the autogenerated result is a bit hit and miss)
- stephbook 7mo agoI think the reason is that the algorithms want to be content-agnostic. But it's of course weird — as a user — to see a conflict resolution tool confidently return something that's not even syntactically valid.