All team members can freely refactor and rearrange their code because they know they’ll be able to merge it easily with SemanticMerge.
It doesn’t matter if one team member refactored an entire file, while another fixed a critical bug; you’ll understand what happened when you merge with SemanticMerge!
Unlike a text-based merge, SemanticMerge parses the code and extracts the structure; therefore, position changes will no longer be an issue.
SemanticMerge can detect when a method* was modified in parallel, even when no “text-block-conflicts” occur; thus enabling you to review the changes. Traditional merge tools would have identified the change as a trivial 'automatic' merge.
Add two different “usings” clauses (C#) on two different locations. Add the same method twice in two different locations. These two scenarios, among others, will be automatically resolved.
SemanticMerge handles structure conflicts, but will use a text-based merge to handle conflicts inside the bodies of methods, functions, properties, etc...
As programmers we always expected merge to be this way: first parse the code, then get the structure and finally merge based on that.
This way a case like the one below, a nightmare for text- based merge tools, involving methods moved to different classes and modified, becomes trivial.
"SemanticMerge takes the stress out of merging and lets me merge with confidence..."
see more ▸"PerforceMerge, which is the tool we have been using until now, is awesome, but SemanticMerge simply outperformed it."
see more ▸"SemanticMerge has allowed me to forge ahead with more confidence in my ability to manage, manipulate, and merge the contributions from YUICompressor's..."
see more ▸"We like SemanticMerge because has an excellent UI that helps to merge changes quickly by focusing on conflicts in the logic rather than wading through..."
see more ▸
"SemanticMerge has been enormously helpful in taming that complex process.
I can, with confidence, separate what requires my attention to resolve and what SemanticMerge does brilliantly..."
"A 3-way merge tool that parses C# code and merges at the structure level, not just as Unicode strings --semanticmerge.com/"
"My friend @plasticscm just launched the most amazing merging tool on the face of the earth: Semantic Merging: --semanticmerge.com"
"There's as new code merging tool in town... "SemanticMerge- Plastic SCM" --semanticmerge.com Free Download of the Beta"
A brilliant idea that seems obvious when implemented Code aware merge semanticmerge.com #semanticmerge /via @shanselman
Is awesome semanticmerge.com identifed debug change I missed because it showed in Semantic differences changed.
The team that made source control awesome, have now taken the pain out of merging code semanticmerge.com @plasticscm
We started with C# and Vb.net, then added Java. Now C is already supported and then we’ll focus on C++, Objective-C and JavaScript, depending on your feedback
2.0 will be supported on OS X and Linux soon. (Currently users have to rely on 1.0 outside Windows).
We’ll be working on enhancements in the merge core: what about being able to track code that has been extracted from one method to a different one? Able to deal with reformatted code seamlessly?
What about being able to track cross- file refactors?
Like being able to calculate "method history" in version control based on Semantic Diffing..
Let us know what you would like to see next.