[email protected]

## [1.3.5] - 2020-01-08
### Fixed
 - Fix "accept mine" / "accept remote" icon swap in conflicts view.

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.3.5] - 2020-01-08
+### Fixed
+ - Fix "accept mine" / "accept remote" icon swap in conflicts view.
+
 ## [1.3.4] - 2019-12-16
 ### Changed
 - Window state is no longer restored after the window is closed and opened.

Editor/Components/AlertBox.cs

@@ -112,6 +112,8 @@ void UpdateAlertBox(Action previousButtonAction = null)
 
             if (m_AlertEntryList.Count == 0)
             {
+                m_Button.text = string.Empty;
+                m_Button.AddToClassList(UiConstants.ussHidden);
                 AddToClassList(UiConstants.ussHidden);
             }
             else
@@ -128,6 +130,7 @@ void UpdateAlertBox(Action previousButtonAction = null)
                 }
                 else
                 {
+                    m_Button.text = string.Empty;
                     m_Button.AddToClassList(UiConstants.ussHidden);
                 }
 

Editor/Components/ChangeListElements/ConflictedChangeListElement.cs

@@ -43,22 +43,22 @@ public ConflictedChangeListElement()
             chooseMergeButton.AddToClassList(ChooseMergeButtonUssClassName);
             chooseMergeButton.tooltip = StringAssets.useMergeTool;
 
-            chooseRemoteButton = new IconButton();
-            chooseRemoteButton.AddToClassList(IconButton.ChooseRemoteUssClassName);
-            chooseRemoteButton.AddToClassList(ButtonUssClassName);
-            chooseRemoteButton.AddToClassList(ChooseRemoteButtonUssClassName);
-            chooseRemoteButton.tooltip = StringAssets.useRemoteChanges;
-
             chooseMineButton = new IconButton();
             chooseMineButton.AddToClassList(IconButton.ChooseMineUssClassName);
             chooseMineButton.AddToClassList(ButtonUssClassName);
             chooseMineButton.AddToClassList(ChooseMineButtonUssClassName);
             chooseMineButton.tooltip = StringAssets.useMyChanges;
 
+            chooseRemoteButton = new IconButton();
+            chooseRemoteButton.AddToClassList(IconButton.ChooseRemoteUssClassName);
+            chooseRemoteButton.AddToClassList(ButtonUssClassName);
+            chooseRemoteButton.AddToClassList(ChooseRemoteButtonUssClassName);
+            chooseRemoteButton.tooltip = StringAssets.useRemoteChanges;
+
             buttons.Add(showButton);
             buttons.Add(chooseMergeButton);
-            buttons.Add(chooseRemoteButton);
             buttons.Add(chooseMineButton);
+            buttons.Add(chooseRemoteButton);
         }
 
         public override void ClearData()

Editor/Views/HistoryTabPageView.cs

@@ -168,6 +168,7 @@ HistoryEntryComponent CreateHistoryEntry([NotNull] IHistoryEntry entry, bool exp
                 // Hide fields used for expanded view
                 comp.changedFilesCount.AddToClassList(UiConstants.ussHidden);
                 comp.changedFiles.AddToClassList(UiConstants.ussHidden);
+                comp.gotoButton.text = string.Empty;
                 comp.gotoButton.AddToClassList(UiConstants.ussHidden);
 
                 // Setup show button

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.unity.collab-proxy",
   "displayName": "Unity Collaborate",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "unity": "2020.1",
   "unityRelease": "0a13",
   "description": "Collaborate with your teammates with the official version control system for Unity. Collaborate is a simple way for teams to save, share, and sync your Unity project.",
@@ -22,6 +22,6 @@
   "repository": {
     "type": "git",
     "url": "[email protected]:unity/com.unity.cloud.collaborate.git",
-    "revision": "78cd48b9afb962995ea685ff191be87e4b067ee2"
+    "revision": "a8169a0bc6ea80906e5edd0804302221d7f7e5f4"
   }
 }