The Semantic Merge tool is a language-dependent source code merge tool provided by Codice Software. It can make a huge number of merge scenarios really easy – particularly ones that can’t be managed by current text-based, language-agnostic, merge tools.
Since it is language-dependent, there will be different releases of Semantic Merge specific for different programming languages.
Our Semantic Merge tool leverages the current merge technology of the merge tool included in Plastic SCM – which is already capable of dealing with refactors through Xmerge – and also the merge system of the Plastic SCM server itself, and combines them together with language-dependent parsing to create the ultimate source code merging machine.
Semantic Merge is not limited to Plastic SCM and can be configured to work with Git, Subversion, Perforce, ClearCase, Team Foundation Server, Mercurial, and many others.