Merge and Auto-Merge Branch File Versions

There are two conditions under which you have the option to "Merge Branch File Versions" or "Automatically Merge Branch File Versions":

In the History tab you have a Branch that was created as a result of a conflict
You have a branched project in which you need to merge changes from one to the other.

In general, you will choose "Automatically Merge Branch File Versions" for straightforward merges. For more complicated merges, select "Merge Branch File Versions". This will call your preferred merger. The Beyond Compare Merger is built in. You can optionally select Guiffy SureMerge. After either merge, you can review the results in the Check-in tab and then check them in once you are satisfied.

Automatically Merge Branch File Versions

When you elect to automatically merge branch versions, Code Co-op will use your preferred merger to silently merge the files in the background. You can then review the results in the Check-in Area of the appropriate project before you check-in the changes.

Merge Branch File Version

When you choose "Merge Branch File Versions", Code Co-op will call your selected merger. When the contents of a file differ, your merger will open showing you the differences. Plus, when files have been deleted, renamed, or moved, you will be asked what to do in each scenario. For example, if a file was created/deleted in the rejected branch, merge will ask if you want to create/delete it in the current version. When a file was renamed or moved, you'll get a choice which name/path to keep in the current version.

After you perform the merge, you can review the results in the Check-in tab by double-clicking on a file. Check-in the changes to propogate them to all project members.