public static void Init (string[] conflictedFiles) { // Get existing open window or if none, make a new one: Instance = EditorWindow.GetWindow<GitConflictsWindow>(true, "Git Push"); if ( conflictedFiles == null ) Instance.ParseData(GitSystem.GetUnmergedFilesList()); else Instance.ParseData(conflictedFiles); }
public static void PostPull() { string[] unmergedFiles = GetUnmergedFilesList(); if (unmergedFiles.Length > 0) { GitConflictsWindow.Init(unmergedFiles); } AssetDatabase.Refresh(); }
public static void Init(string[] conflictedFiles) { // Get existing open window or if none, make a new one: Instance = EditorWindow.GetWindow <GitConflictsWindow>(true, "Git Push"); if (conflictedFiles == null) { Instance.ParseData(GitSystem.GetUnmergedFilesList()); } else { Instance.ParseData(conflictedFiles); } }
static void GitResolveConflicts() { GitConflictsWindow.Init(); }