Merging#

You can merge branches if there are no conflicts, directly from the Unity VCS web experience.

To merge a branch:

1. From the Branches tab, select the three dots on the right-hand side of the branch you want to merge.
2. Select Merge branch into…
3. On the Merge page, the source branch and destination branch are already populated but you can change these if you want.
4. If there are no merge conflicts, select Merge.
5. On the dialog, add a comment.
6. Select Check-in merge.

Merge conflicts#

Occasionally, a merge can’t be performed due to merge conflicts.

If your branch has merge conflicts, you must resolve the merge conflicts in the Unity VCS client to continue. Once the merge conflicts have been resolved, complete the steps in merging.

Merge rule in action#

Merge rules are set by administrators.

Below is an example of a merge rule in action:

The branch can't be merged because code reviews weren't approved.