Unity Version Control 11.0.16.10512

All platforms - Command-line: Resolve merge conflicts on disk with conflict markers: `cm merge --conflict-markers` finishes a merge that has text file conflicts without opening a merge tool. It writes each conflict into the workspace file between standard diff3 conflict markers, so you can resolve it in a text editor, from a script, or with a coding agent that can't drive a GUI. `cm checkin` refuses the check-in while a file still contains markers.

All platforms - Command-line: Resolve merge conflicts on disk with conflict markers: Refer to cm merge.

All platforms - Command-line: Code review comments and reviewers in cm codereview: `cm codereview` ( `cm cr` ) has three new subcommands that work on branch, changeset, and shelve reviews:

All platforms - Command-line: Code review comments and reviewers in cm codereview: Refer to cm codereview.

All platforms - Command-line: Set reviewers and change titles with cm codereview: `cm codereview` sets the reviewers of a new review with `--users` and `--groups` .

All platforms - Command-line: Set reviewers and change titles with cm codereview: `cm codereview -e` changes the title of a review with `--title` .

All platforms - Command-line: Set reviewers and change titles with cm codereview: Refer to cm codereview.

All platforms - Command-line: line field in cm find changereviewcomment: `cm find changereviewcomment` prints and filters by `line` , which counts from 1, like a text editor and the `--line` option of `cm cr comment add` .

All platforms - Command-line: line field in cm find changereviewcomment: The filter accepts `=` and `!=` .

All platforms - Command-line: line field in cm find changereviewcomment: `location` keeps the stored value, which counts from 0. `line` is empty for comments that aren't on a line of a file.

All platforms - Command-line: Edit the comment of a branch or a label: `cm branch editcomment` and `cm label editcomment` replace the comment of an existing branch or label, in the same way that `cm changeset editcomment` does for changesets. Editing a label comment leaves the label on the changeset it's applied to.

All platforms - Command-line: Edit the comment of a branch or a label: Behavior change: `edit` is an alias for `editcomment` , so `cm branch edit` and `cm label edit` now edit a comment instead of creating a branch or label named "edit". To create a branch or label, use `cm branch create edit` or `cm label create edit` .

All platforms - Command-line: Edit the comment of a branch or a label: Refer to cm branch editcomment and cm label editcomment.

All platforms - Command-line: cm changeset editcomment reads the comment from a file: `cm changeset editcomment` can now read the new comment from a file with `-commentsfile` , and an empty comment ( `""` ) clears the comment.

All platforms - Command-line: cm changeset editcomment reads the comment from a file: Refer to cm changeset editcomment.

All platforms - Command-line: Faster commands that print user names: `cm find` , `cm history` , `cm annotate` , and `cm repo list` now resolve all the user names they print in a single request to the server, instead of one request for each user.

All platforms - Command-line: Faster commands that print user names: Commands that list many objects owned by different users run several times faster. For example, listing the branches of a large repository with their owners (or with `--xml` ) takes about 1.5 seconds instead of 9. The output is unchanged.

`comment` adds, replies to, edits, and deletes review comments, on the whole review or on a line of a file.

`reviewer` adds, removes, and lists the reviewers of a review.

`review` sets your own review status, or asks reviewers to review again.

All platforms - Desktop GUI: Fixed links misaligned with the surrounding text: Links in Desktop GUI messages now line up with the surrounding text.

All platforms - Desktop GUI: Fixed links misaligned with the surrounding text: Previously, the following were displayed below the rest of the sentence:

All platforms - Desktop GUI: Fixed empty tips panel: The Tips panel now closes correctly even when its view isn't visible. Previously, if a tip closed while you were in another view, going back to that view showed an empty panel with only the Disable all tips checkbox and the OK button.

All platforms - Desktop GUI: Fixed empty tips panel: For example, this happened after a check-in from the Workspace Explorer refreshed the Pending Changes view, or when a tip closed on its own after a few minutes.

All platforms - Command-line: Fixed cm changeset editcomment changing comments when its arguments are invalid: `cm changeset editcomment` now keeps a comment such as "Is it ready?" as typed, instead of expanding it as file names. When words are left over, as with an unquoted `Fix the login timeout` , or when an option takes the place of the comment, the command now shows its usage and leaves the comment unchanged.

All platforms - Command-line: Fixed cm changeset editcomment changing comments when its arguments are invalid: Previously, it kept only the first word, or cleared the comment.

Windows - Command-line: Fixed slow cm shell startup on Cloud Edition: On Cloud Edition, `cm shell` now executes its first command in about 0.3 seconds, even when multiple shells start at the same time. Previously, it took 3–4 seconds, or about 9 seconds with several shells. This also speeds up the startup of IDE plugins and other tools that rely on `cm shell` .

• Windows

All platforms - Command-line: Fixed Unity organizations shown as IDs in cm output: `cm` now shows Unity organizations by name ( `repo@MyOrg@unity` ) in all its output.

All platforms - Command-line: Fixed Unity organizations shown as IDs in cm output: Previously, the following outputs printed them as numeric IDs ( `repo@1375488836673@cloud` ):

All platforms - Command-line: Fixed Unity organizations shown as IDs in cm output: The XML layout is unchanged, so tools that parse it keep working.

All platforms - Command-line: Fixed Unity organizations shown as IDs in cm output: `cm profile delete` also accepts the organization name of a Unity organization profile.

The pending changes view and here links in the "Merge finished" message of the Merge view.

The changeset link in the check-in notification.

The shelve link in the shelve notification.

`cm status --xml`

`cm status --wkconfig --cset`

`cm history --xml`

The xlink items of `cm merge --xml`

The name field of `cm profile list --format`

Several error messages.