Resolving Conflicts

When working with Branching and Merging, conflicts may occur. This is caused when the same line of a file has been modified in by different users or in different branches of a project. 

CSDiff, ComponentSoftware's file comparison tool may be used for resolving conflicts visually. You may also configure a 3^rd party merge tool that will be called by CS-RCS on any file type.

              
Click on pictures to enlarge