Unity Version Control 11.0.16.9069

Bug

1. Change

   All platforms - Desktop GUI: Improve progress for directory conflicts resolution.

2. Improvement

   All platforms - Desktop GUI: The Merge & Incoming Changes views need to handle directory conflicts in some scenarios. The progress of the directory conflicts resolution was not properly updated with multiple selection plus the "Apply this action for next X conflicts" option enabled.

3. Change

   All platforms - Desktop GUI: Moreover, the "Resolve directory conflict" button was not disabled during the directly conflicts resolution. So, if the button was clicked, it launched more concurrent conflicts resolutions for nothing.

4. Improvement

   All platforms - Desktop GUI: Now, the button is disabled and the progress properly updated during the directory conflicts resolution.