2 ms·
So, if I understand you correctly: 1. merge conflicts are almost unavoidable in a non-trivial codebase 2. resolving merge conflicts in some SCM system
by falsedan 13y ago
So, if I understand you correctly:
1. merge conflicts are almost unavoidable
in a non-trivial codebase
2. resolving merge conflicts in some SCM systems
is unreasonably difficult
- datr 13y agoI'd change 2 to "resolving merge conflicts in all SCM systems is necessarily difficult." As far as I know there's no SCM system which can understand the /intent/ of the change and without being able to reconcile the intents of two conflicting merges there's no way of reliably merging the code (at least as far as I know).