Merge
From the Unity Editor, merge your changes into your current branch.
阅读时间1 分钟最后更新于 10 个月前
注意
To solve 3-way merge conflicts, you need to install the VCS desktop app.
You can merge your changes into your current branch.
- 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.
- 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.
- If you don't have merge conflicts, select Apply changes.
- Go to the Pending Changes tab to find the changes applied in your workspace.
- Select Check in.
In the Pending Changes tab, you can also find a list with the merge links which details all of your merges.