I'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 /inten

I'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).