Home / Plastic SCM Professional  / Visualizations  /

Differences and 3 way merge tools

Differences and 3 way merge tools

Plastic SCM provides several differences and merge tools to accommodate different kinds of digital assets. While source code managing tools are most widely used, other formats like images and Microsoft Word are also supported.

diffcodeCode differences. Classical code file differences have been enhanced aplying syntax highlight. This makes the code easier to read and follow. Soft gradients and carefully chosen color schemes to display differences also contribute to an overall more confortable experience.
diffimageImage differences. Supporting two modes, side by side or blended, where both images are blended together making it very easy to spot differences. A slide bar controls the level of transparency applied to the images.
mergecodeCode merge. The 3-way merge is always a complicated process. We applied the same visualization technology previously used for differences, this time a step beyond. Our merge algorithms are highly optimized to resolve automatically as many conflicts as possible, and even for those not automatic, try to suggest the best possible solution before hand.

Other productivity tools are also available for graphical differences and merge of folders, Word and other binary files.

 
 
 
 


(C) 2007 Codice Software. All rights reserved. Contact