Merge On Check In

A merge can occur at Check In command. (Only when the current team project is set to allow multiple checkouts).

If multiple users have checked out a file and one of the users checks in the file with changes, when you subsequently check in the file, the differences between the current version and your local copy of the file will be merged into a new version of the file in SourceAnywhere Hosted.

This is a three-way merge. The baseline file is the repository version of the file that you check out. The result file is the local copy of the file.

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