uvcs-merge

Merge a UVCS / Plastic SCM branch, changeset, label, or shelve into the current workspace with the cm CLI and drive it to a clean, resolved workspace without ever opening a merge tool window: preview first, apply with diff3 conflict markers, resolve or pick a contributor, verify, then hand the check-in decision back to the user. Use whenever the user wants to merge or integrate one UVCS branch into another, merge down from /main into a task branch, cherry-pick a changeset, resolve UVCS merge conflicts, finish a merge that is already in progress, or when cm refuses an operation because a merge is in progress or conflict markers are still pending. All cm syntax comes from the uvcs-core skill — load it first.

Compatibility

Requires the cm CLI (Unity Version Control client) on PATH