The idea of automatic syntax-aware merging in version-control systems goes back to 2005 or ea [...]