>Imagine resolving code conflicts by resolving things at the AST level. This sounds extremely nice actually. The more semantically aware the version control sy

>Imagine resolving code conflicts by resolving things at the AST level. This sounds extremely nice actually. The more semantically aware the version control system is, the more likely it can gracefully handle merge conflicts. A textual diff is a very low level transformation primitive; composing them doesn't guarantee very much at the higher level.