Merge pull request #3288 from Ginger-Automation/BugFix/35148-Unexpect…

…edPopupWhenNoConflict BugFix - 35148 - Unexpected popup when no conflict
Ginger-Automation · Oct 12, 2023 · 72b4295 · 72b4295
2 parents bfb8b39 + e0215e1
commit 72b4295
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Ginger/Ginger/SourceControl/CheckInPage.xaml.cs b/Ginger/Ginger/SourceControl/CheckInPage.xaml.cs
@@ -404,6 +404,11 @@ private static bool CommitChanges(SourceControlBase SourceControl, ICollection<s
                         return true;
                     }
                 }
+                else
+                {
+                    //no conflicts to handle
+                    conflictHandled = true;
+                }
                 return false;
             }
             return result;
@@ -482,7 +487,7 @@ private void AfterCommitProcess(bool CommitSuccess, bool conflictHandled)
                             CommentsTextBox.Text = string.Empty;
                             mCheckInWasDone = true;
                         }
-                        else if (!CommitSuccess)
+                        else if (!CommitSuccess && !conflictHandled)
                         {
                             Reporter.ToUser(eUserMsgKey.SourceControlChkInConflictHandledFailed);
                             CloseWindow();