there was such a thing for c#, called semantic-merge by Codice Software, a Spanish company that after being bought by Unity, killed it...