Three-way merge

SQL Server-based software configuration management (SCM) tool/system

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

In a multiple checkouts situation, if you try to check in the file after another user's check-in, there will be a version conflict:

Figure 1 - Version Conflicts occur

You can choose to merge in merge tool.

Figure 2 - Merge in merge tool

And if you get the latest version of the file after another user's check-in, you will get the following message dialog box. According to the Use Visual Merge setting in Tools| Options| General, Dynamsoft SCM Anywhere will open the Visual Merge Window or perform manual merge.

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

Figure 4 - Visual Merge window

Back