|
|
@@ -27,7 +27,7 @@ namespace Terra.Arbitrator.GUI
|
|
|
/// <param name="onCloseCallback">A callback that provides the list of files the user selected to reset. If the user cancels, the list will be null.</param>
|
|
|
public static void ShowWindow(List<string> conflictingFiles, Action<List<string>> onCloseCallback)
|
|
|
{
|
|
|
- var window = GetWindow<ConflictResolutionWindow>(true, "Pull Conflicts Detected", true);
|
|
|
+ var window = GetWindow<ConflictResolutionWindow>(true, "Conflicts Detected", true);
|
|
|
window.minSize = new Vector2(600, 400);
|
|
|
window._conflictingFiles = conflictingFiles;
|
|
|
window._filesToReset = new List<bool>(new bool[conflictingFiles.Count]); // Initialize all to false
|
