Merge changes#

You can merge changes that you make into a destination branch. Whether you can merge depends on the merge rules in place.

For information on how to automatically merge changes and check for merge conflicts, refer to Mergebots.

You can manually merge branches and changesets in the Unity Cloud dashboard:

1. Locate the changes that you want to merge.
   • To merge a reviewed changeset or branch, open the code review and select Merge.
   • To manually merge a branch, open the Branches tab, right-click the branch and select Merge branch into….
   • To manually merge a changeset, open the Changesets tab, right-click the changeset, and select Merge changeset into….
2. On the Merge page, you can edit the default values in the Destination branch and Source dropdowns if you want.
3. If there are no merge conflicts, select Merge.
4. In the dialog, add a comment.
5. Select Check-in merge.

Merge conflicts#

Merge conflicts can prevent you from merging changes. You can resolve merge conflicts in the Unity Version Control desktop client.