Any experienced developer at one time or another has encountered issues when merging their code and has been met with that nasty conflict icon. A new product from
Plastic SCM called Semantic Merge is hoping to get rid of that little red guy once and for all by using a merge that actually attempts to understand the code that it is merging together. It’s built on top of
Microsoft’s Roslyn, which if you are unfamiliar with, is going to be a game-changer in the future.
Semantic Merge doesn't care about the order that your code appears in because it actually understands what is going on within it (to an extent) and rather than focusing on the actual location of your code, it focuses on the structure and can actually determine if a change will actually affect functionality (within reason) and if it might just be an aesthetic change.
Although the product is still within its beta phase, it looks to become a really powerful tool in the future.
Features
Here are a few of the “highlights” that Semantic Merge currently offers:
You can read about more of these features and more detailed explanations (and visualizations) of each of them
here.
Go Play With It.
Semantic Merge takes a new approach to merging code and attempts to actually understand what is going on.
Since Semantic Merge is still currently in beta, you can head on over to Plastic SCM’s Semantic Merge site and download it: