Semantic Merge

There are few things in software development as surprisingly political as merging your code when there are conflicts. A Tale of Merge Politics Your first reaction to this is probably to think that I’m crazy, but seriously, think about what happens when your diff tool/source control combo tells you there’s a conflict. You peer at…