Three-way merge

The three-way merge feature is most useful in a collaborative development circumstance.

In a multiple checkouts situation, when multiple users have checked out a file for modifications, and the first user checks in the file. Then if you check in the file, the three-way merge will be invoked automatically to merge another user's change with your own, and if you get the latest version of the file, a dialog box will pop up and you can choose the Merge button to operate the three-way merge.

Figure 1 - Indicates a modified copy of the file exists in the working folder

If there is any conflict during the three-way merge,  SourceAnywhere opens the Visual Merge Window. If no conflict is found, the file will be merged automatically.

Figure 2 - Visual Merge window

Back