Documentation

​
​

Development

User Acquisition

Monetization

Industry

Unity Version Control

DevOps

On-prem

Gluon

Editor plug-in

Open Unity Dashboard

Unity Version Control

​
​
Unity Version Control
  • Overview
  • Cloud Repositories organization update
  • Installation
  • Use UVCS with the Unity Editor
    • Add version control to projects
    • Editor version control tutorials
      • Check in files
      • Ignore files
      • View changes
      • Undo changes
      • View changesets
      • Switch to changeset
      • Revert to changeset
      • Create branch
      • Switch to branch
      • Merge
    • UI Reference
  • Unity Version Control plugins
  • Concepts
  • Tutorials
  • On-Prem
  • Gluon
  • CLI and shortcut references
  • Release Notes
  1. Unity Version Control (previously Plastic SCM)

Merge

From the Unity Editor, merge your changes into your current branch.
Read time 1 minute
Last updated 10 months ago
Note
To solve 3-way merge conflicts, you need to install the VCS desktop app.
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.
Copyright © 2026 Unity Technologies
LegalPrivacy PolicyCookiesDocumentation Terms of UseDo Not Sell or Share My Personal InformationYour Privacy Choices (Cookie Settings)

"Unity", Unity logos, and other Unity trademarks are trademarks or registered trademarks of Unity Technologies or its affiliates in the U.S and elsewhere (more info here). Other names or brands are trademarks of their respective owners.

Some pages are machine-translated for convenience, and may contain inaccuracies. In the event of conflicting information, the English version is authoritative.

    Report a problem with this page