back to content

sign up free version control plan

Merge Files

Conceptions

Merge - Merge is an operation that allows you to combine differences in two or more files into one file.

Baseline File - When you compare the differences in two or more files, you need a baseline to identify the differences. Baseline File is a file that plays such a role in a merge.

Result File - The result file of a successful merge.

Three-way Merge - In a three-way merge, it involves three files. The baseline file is the original version of file. The other two files are changed on the basis of the baseline file.

Conflicts - Line differences are regarded as conflicts.

Automatic Merge - A merge that involves no conflict.

Visual Merge - If there is any conflict in the files you attempt to merge, Dynamsoft SourceAnywhere Hosted does not resolve the conflicts automatically. Instead, it displays a graphical window in which you can resolve all the conflicts manually.  In a three-way merge, Dynamsoft SourceAnywhere Hosted always displays the Visual Merge window.

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

• Multiple Checkouts - In a multiple checkouts situation, when multiple users have checked out a file for modifications, and the first user checks in the file. You, a subsequent user to check in or get the file, can use the merge feature to merge another user's change with your own.
   
• Branch - When a file is branched for independent development in different paths, and another user has completed the development in one branch. After you complete the development in your branch, you can use the merge feature to merge that user's change into your branch of the file.

In Dynamsoft SourceAnywhere Hosted, a merge may occur in the following cases:

• At Check In command
   
• At Get command
   
• At Merge Branches command.

For information about how a merge occurs and how to resolve conflicts, please refer to:

• Merge On Check In
   
• Merge On Get
   
• Merge Branches
   
• Resolve Conflicts