Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BugFix - 35148 - Unexpected popup when no conflict #3288

Merged
merged 2 commits into from
Oct 12, 2023
Merged

BugFix - 35148 - Unexpected popup when no conflict #3288

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1ad77b
Bug: When there was no conflicts after getting the latest changes, st…
IamRanjeetSingh Oct 12, 2023
e0215e1
Merge branch 'Releases/Official-Release' into BugFix/35148-Unexpected…
Maheshkale447 Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Ginger/Ginger/SourceControl/CheckInPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Loading