Merge#

You can merge your changes into your current branch.

1. Merge the changes of either a branch or changeset to your current branch:
   • To merge a changeset, right-click the changeset in the Changesets tab and select Merge from this changeset.
   • To merge a branch, right-click the branch in the Branches tab and select Merge from this branch.
2. If you have merge conflicts, select Resolve conflicts to process each conflict sequentially. If UVCS can solve a conflict automatically, UVCS skips that conflict without user intervention. Alternatively, you can right-click on each conflict and solve it one at a time.
3. If you don't have merge conflicts, select Apply changes.
4. Go to the Pending Changes tab to find the changes applied in your workspace.
5. Select Check in.

In the Pending Changes tab, you can also find a list with the merge links which details all of your merges.