Sujith :) ->

1. Changed things

Assets/Better Git/Arbitrator/Editor/GUI/ArbitratorController.cs

@@ -438,7 +438,7 @@ namespace Terra.Arbitrator.GUI
             }
         }
         
-        private void ForcePull()
+        public void ForcePull()
         {
             StartOperation("Attempting to pull and create conflicts...");
             

Assets/Better Git/Arbitrator/Editor/GUI/ConflictResolutionWindow.cs

@@ -85,7 +85,7 @@ namespace Terra.Arbitrator.GUI
 
             if (GUILayout.Button("Proceed with Pull (Risky)", GUILayout.Height(30), GUILayout.Width(180)))
             {
-                _controller.PerformSafePullWithLock();
+                _controller.ForcePull();
                 Close();
             }
             if (GUILayout.Button("Cancel", GUILayout.Height(30)))

Assets/Better Git/GitMerge/Editor/GitMergeWindow.cs

@@ -37,6 +37,8 @@ namespace GitMerge
         private Texture2D brokenLogo;
         private Texture2D fixedLogo;
         
+        private const string DockNextTo = "UnityEditor.GameView,UnityEditor.dll";
+        
         private static void OpenEditor()
         {
             GetWindow();
@@ -44,9 +46,10 @@ namespace GitMerge
 
         private static EditorWindow GetWindow()
         {
-            var window = GetWindow(typeof(GitMergeWindow), false, "GitMerge");
+            var type = Type.GetType(DockNextTo);
+            var window = GetWindow<GitMergeWindow>(type);
+            window.titleContent = new GUIContent("Git Merge", EditorGUIUtility.IconContent("TreeEditor.Distribution On").image);
             window.autoRepaintOnSceneChange = true;
-            window.minSize = new Vector2(500, 100);
             return window;
         }
 
@@ -253,9 +256,9 @@ namespace GitMerge
         {
             var assetType = asset.GetType();
             return assetType == typeof(GameObject) ||
-#if UNITY_2022_3_OR_NEWER
-                   assetType == typeof(BrokenPrefabAsset) ||
-#endif
+// #if UNITY_2022_3_OR_NEWER
+//                    assetType == typeof(BrokenPrefabAsset) ||
+// #endif
                    assetType == typeof(DefaultAsset);
         }
 

Assets/Scenes/SampleScene.unity

@@ -436,7 +436,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 254937477822833254, guid: 20ea0bfd22b354d0fbe4e2c4e2ae2ef0, type: 3}
       propertyPath: m_Name
-      value: Shakesphere1321323
+      value: Shakesphere
       objectReference: {fileID: 0}
     - target: {fileID: 1917423583392372291, guid: 20ea0bfd22b354d0fbe4e2c4e2ae2ef0, type: 3}
       propertyPath: m_LocalPosition.x