Merge Branches

Merge Branches allows you to merge the changes made in one branch of a file/folder into another branch. Generally, these two branches are generated from a common original version. After a merge, the changes made based on the original version will be merged into the target branch.

This is a three-way merge. The baseline file is the original version from which the two branches of file are generated. The result file is the target branch on which the Merge Branches command is performed.

In order to merge items quickly and reliably, we suggest:

1. Ensure Target Branch has no checked out or pinned items
   
   If items in the target branch are checked out or pinned, they will fail to be updated. Please check in all items, or undo all outstanding check outs, before merging. Also, make sure all pinned items are unpinned before attempting a merge.
   
   
2. Make sure the file you want to merge is mergeable
   
   In SourceAnywhere Hosted, there are two file types: Mergeable and Binary. You can find out or change the type of a file via File Properties -> General Tab -> Type. SourceAnywhere cannot merge binary files. If the file you want to merge is binary, you’ll need convert it to a mergeable file before you can merge it.
   
   If you want to convert files in bulk, we suggest using our File Type Convert Tool.

Here is the merge workflow chart. For more info on mergeable and unmergeable conflict types, please refer to Resolve Conflicts

If there is any conflict, SourceAnywhere will either display Visual Merge window or perform manual merge. If no conflict is found, the file will be merged automatically.