Check in changes
You can merge changes that you make into a destination branch. Whether you can merge depends on the merge rules in place.
Merge conflicts can prevent you from merging changes. You can resolve merge conflicts in the Unity Version Control desktop client.
Check in changes in the Unity Cloud Dashboard
You can manually merge branches and changesets in the DevOps Unity Cloud dashboard:
- 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….
- On the Merge page, you can edit the default values in the Destination branch and Source dropdowns if you want.
- If there are no merge conflicts, select Merge.
- In the dialog, add a comment.
- Select Check-in merge.
Note: For information on how to automatically merge changes and check for merge conflicts, refer to Mergebots.
Check in changes in the GUI
You can select changed files in the Pending Changes tab and check them in as a changeset.
- Select the files you want to check in.
- Enter a comment for the changeset.
- Select Check in.
Check in changes in the CLI
If you’ve made any changes to a file in your workspace, you can run cm status to retrieve a list of your changed files.
Check in all changes
To check in all of your pending changes, run ci –all:
>cm ci --all
The selected items are about to be checked in. Please wait ...
Assembling checkin data
Validating checkin data
Uploading file data
Uploaded 0 bytes of 2.77 KB (0%)
Confirming checkin operation
Modified c:\Users\pablo\wkspaces\quake_path\code
Modified c:\Users\pablo\wkspaces\quake_path\code\lib
Modified and moved from c:\Users\pablo\wkspaces\quake_path\code\FileSystem-renamed.cs to c:\Users\pablo\wkspaces\quake_path\code\lib\FileSystem.cs
Created changeset cs:575@br:/main/fix-1342@quake@localhost:6060 (mount:'/')The --all modifier means every file that’s changed, deleted, or moved. To include private files, you can use ci –all –private.
Check in changes in a given path
To check in changes on a specific path, specify the path in your cm ci command. For example:
cm ci task001\alpha\* -c “alpha files checked in” –all