> the key insight is that changes should be flagged as conflicting when they touch each other Not really. Changes should be flagged as conflicting when they co

> the key insight is that changes should be flagged as conflicting when they touch each other Not really. Changes should be flagged as conflicting when they conflict semantically, not when they touch the same lines. A rename of a variable shouldn't conflict with a refactor that touches the same lines, and a change that renames a function should conflict with a change that uses the function's old name in a new place. I don't think I would bother switching to a new VCS that didn't provide some kind of semantic understanding like this.