4 ms·
What exactly is going to be the problem when all version control systems do is merge based on text differences? Also the block separation here could actually be
by hacker_9 10y ago
What exactly is going to be the problem when all version control systems do is merge based on text differences? Also the block separation here could actually be used semantically and provide better merging than for existing languages.
- JBReefer 10y agoMarkup and storage semantics. Try merging .xls documents.
- hinkley 10y agoI said handling merge conflicts, not handling merges. The ergonomic presentation of a three way merges is not a solved problem in text-based programming languages, but you have to have something if you want more than one developer working on a single project.