Entity-level git merge driver. Resolves false conflicts git invents when independent age…