Merging Changes to a Target Branch
You merge item changes to a target branch by first selecting a source commit on a source branch. Changes made on the source branch up to and including the source commit will be made available for merging into the target branch. The merge itself will create a new commit on the target branch that includes all item changes you decided to merge.
To make two branches “equal” to each other in terms of their latest item versions, you first need to merge all changes from the latest commit on the first branch to the second branch, and then repeat this in the opposite direction.
To merge from a particular source commit, do one of the following:
•
Select a branch node () in the The Databases Tree and click the Merge button () in the Repository section of the Database toolbar. The source commit is the latest commit on the branch.
•
Select a snapshot node () in the The Databases Tree and click the Merge button () in the Repository section of the Database toolbar. The source commit is the commit that the snapshot references.
•
Select a commit table row in the The Commits Window and click the Merge button () in the window’s toolbar.
In all cases, The Merge Window is opened with a suggested target branch.