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
  • Unity Version Control plugins
  • Concepts
  • Tutorials
    • Migrate from Git
    • Migrate from Perforce
    • Version Control settings
    • Configure the client
    • Version Control workflow
      • Set up a workspace
      • Create a repository
      • Use a nodata replica
      • Create a branch
      • Modify files
      • View file history
      • Code reviews
      • Code reviews (GUI)
      • Merge changes
        • Merge branches
        • Navigate the Mergetool window
        • Resolve merge conflicts
        • Checkouts
        • Shelve changes
        • Undo changes
    • Version Control tools
  • On-Prem
  • Gluon
  • CLI and shortcut references
  • Release Notes
  1. Unity Version Control (previously Plastic SCM)

Merge changes

Merge your branches and resolve merge conflicts.
Read time 1 minute
Last updated 10 months ago
Merge branches
Merge branches in Unity Version Control workflows.
Navigate the Mergetool window
Learn how to navigate the mergetool window to resolve merge conflicts.
Resolve merge conflicts
Resolve merge conflicts in Unity Version Control.
Checkouts
Learn how to check out files and manage changes in Unity Version Control workspaces.
Shelve changes
Shelve changes to files in Unity Version Control.
Undo changes
Undo local changes in your repository.
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
    ​
    ​