Unity Version Control 11.0.16.8168

All platforms: Improved merge file conflicts with Smart Locks

A file is always checked-out when solving a conflict. It doesn't matter the type of resolution chosen (merge, keep source or keep destination). This prevents the creation of parallel changes while a merge is being processed in a workspace.

Before, when solving a file conflict with an existing lock in Retained status, the destination of the merge had to always be the retained revision. This implied running an extra merge (rebase) from the destination branch (/main) to the branch to integrate (/main/task) before integrating the branch into /main. Now, the branch that contains the Retained revision (/main/task) can be directly integrated into the destination branch (/main) so the file conflicts are solved there without any extra step.

All platforms - Plugin for JetBrains IDEs: Fixed wrong diff calculation after applying a shelve

All platforms - Plugin for JetBrains IDEs: The UVCS plugin for JetBrains IDEs calculated the wrong diffs for items that were checked out in the workspace as a result of applying a shelve using a UVCS client (GUI/CLI) outside the IDE. Now it's fixed.

Command-line client: Partial check-in progress bar glitches

Command-line client: When running a partial check-in operation, the progress bar line and the results were overwriting each other in the command line.

Command-line client: Now both are displayed properly.

Command-line client: Switch and partial switch will now take into account the workspace repository

Command-line client: Before, running the "cm switch" or "cm partial switch" commands under a Xlinked directory, the default repository was the Xlinked one. This behavior was confusing, and it could produce unexpected changes in the workspace:

Command-line client: Now, the top-level repository is used by default for these commands. If you really need to switch to a different repository, you can still achieve it by explicitly typing the destination repository:

All platforms: Merge didn't release locks for file conflicts with keep destination resolution

All platforms: The lock was ignored after solving a file conflict with the keep destination resolution. So, if there was a lock related to that merge, the lock could get out-of-dated. This happened for client-side merge and server-side merge. Fixed.

All platforms - All clients: Fixed the update progress message in Japanese

All platforms - All clients: We applied a more accurate wording in the Japanese localization for the message that gets displayed while updating a workspace.

All platforms - Desktop GUI: Added ScrollViewer to the initial login window

All platforms - Desktop GUI: Previously, when launching the GUI with no configuration (no accounts) and resizing the window to a minimal height, the controls were being cut off, and a scrollbar was not displayed as expected.

All platforms - Desktop GUI: Now, we have introduced a ScrollViewer to the view. This means that when the contents do not fit within the screen height, a scrollbar will automatically appear, allowing users to access all controls even in smaller windows. Screenshot:

• Windows

All Platforms - Text Merge Tool: Comparison Method options cannot be deactivated

All Platforms - Text Merge Tool: Previously, the three comparison method options (Ignore EOLs, Ignore Whitespaces, Ignore EOLs, and Whitespaces) were always checked and could not be manually deactivated by the user. Now it's fixed.