|
@@ -561,7 +561,6 @@ namespace Terra.Arbitrator.GUI
|
|
|
GitService.AnalyzeStashConflicts()
|
|
|
.Then(analysisResult =>
|
|
|
{
|
|
|
- Debug.Log($"Any conflicts? {analysisResult.HasConflicts}");
|
|
|
FinishOperation();
|
|
|
if (analysisResult.HasConflicts)
|
|
|
{
|
|
@@ -572,7 +571,6 @@ namespace Terra.Arbitrator.GUI
|
|
|
var conflictingChanges = stashedFiles
|
|
|
.Where(sf => analysisResult.ConflictingFiles.Contains(sf.FilePath))
|
|
|
.ToList();
|
|
|
- Debug.Log($"Found {conflictingChanges.Count} conflicting files. Showing window.");
|
|
|
ConflictResolutionWindow.ShowWindow(this, conflictingChanges, conflictSource);
|
|
|
});
|
|
|
}
|