Описание тега semantic-merge

The Semantic Merge tool is a source code diff and merge based on language parsing, designed to deal with code that has been moved and modified.

What is does

As programmers we always expected merge to be this way: first parse the code, then get the structure and finally merge based on that.

Features

• Location independent method merge
• Visual Merge and Diff
• Tracks what has been added on a location in an independent way
• Dealing with language specific constructs: ‘using’ clause in C#
• Method based conflicts – even if text blocks don’t collide
• Fully refactor aware
• Semantic Diff included
• Able to cope with divergent refactors
• Move and delete scenarios
• Semantic Merge fallback mechanism
• Bonus track included in the package – Xdiff and Xmerge tools

Documentation

http://www.semanticmerge.com/index.html

Contact

• Email: support@codicesoftware.com
• Twitter
• User voice
• Forum