Whenever we introduce any new developer to branching and merging there’s an idea on the top of their heads: “hey, shouldn’t the merge tool understand the programming language?”. Later we all get used to the existing toolsets for merging code and we lose sight of our initial desire for language-aware merge tools. However, the thought remains in the minds of every developer.

And that’s exactly what we have done with SemanticMerge: develop a merge tool capable of parsing the source code and merge (and diff!) based on that extended information.

The benefits are clear: no longer prevent yourself from cleaning up code because you feel it will be a pain to merge it later – SemanticMerge will deal with it. You move a method to a different location and somebody else modifies it at the original location? No problem, SemanticMerge will deal with it.

SemanticMerge continues to raise the bar for version control. Only half a decade ago, status quo for version control was broken with the introduction of Git and the new DVCS. Now is the time for better tools to deal with intensive parallel development and the need to merge code more efficiently. Visit our booth and find out what SemanticMerge, the language-aware diff and merge tool that understands your code is all about.

Topics covered include:

• Better understanding refactors using semantic differencing.
• Merging heavily refactored code in C# and Java.
• Complex merge resolution in collaboration with the version control.
• A look into the future: multi-file SemanticMerge and new languages.