Language-Aware Diff & Merge

IntelliDiff is a new technology from Slyce Software. It applies a deep understanding of languages to the diff & merge process, allowing it to intelligently match the semantic meaning of code and ignore formatting and layout differences. This means no false positives and far easier and quicker merging.

Automatically Resolves Most Changes

IntelliDiff resolves most changes automatically. You can view the changes the user has made and the changes in the latest version of any generated file.

Resolve Conflicts Easily

Changes that cannot be resolved automatically are presented in a conflict editor, where you can resolve them manually. False positives in C# files are minimised by an enhanced version of IntelliDiff which is semantically aware. This means that it doesn't get confused by differences in code formatting or re-ordered functions or fields etc. Enhanced support for VB.net, Java, XML and HTML is coming soon.

Beware of other tools that:

• Ban any modifications to generated code
• Only allow editing between special markers in the code
• Use special language features such as partial classes in C#

These approaches are often unworkable. They are too restrictive and force ugly workarounds. Your code is never completely your own.