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

merged 2 commits into from
Oct 12, 2023

Conversation

IamRanjeetSingh
Copy link
Contributor

Thank you for your contribution.
Before submitting this PR, please make sure:

  • PR description and commit message should describe the changes done in this PR
  • Verify the PR is pointing to correct branch i.e. Release or Beta branch if the code fix is for specific release , else point it to master
  • Latest Code from master or specific release branch is merged to your branch
  • No unwanted\commented\junk code is included
  • No new warning upon build solution
  • Code Summary\Comments are added to my code which explains what my code is doing
  • Existing unit test cases are passed
  • New Unit tests are added for your development
  • Sanity Tests are successfully executed for New and Existing Functionality
  • Verify that changes are compatible with all relevant browsers and platforms.
  • After creating pull request there should not be any conflicts
  • Resolve codacy comments
  • Builds and checks are passed before PR is sent for review
  • Resolve code review comments
  • Help Libray document is updated accordingly for Feature changes.

@IamRanjeetSingh
Bug: When there was no conflicts after getting the latest changes, st…
d1ad77b 
…ill we were getting a 'Unhandled Conflict' popup.

RC: If the Push fails, we do an auto Pull. We were not checking if the Pull resulted in conflicts or not, we were showing the popup in either case.
Fix: Added check to see if the pull resulted in conflicts before showing the popup.
@Maheshkale447 Maheshkale447 merged commit 72b4295 into Releases/Official-Release Oct 12, 2023
5 of 7 checks passed
@Maheshkale447 Maheshkale447 deleted the BugFix/35148-UnexpectedPopupWhenNoConflict branch October 12, 2023 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Maheshkale447 Maheshkale447 Maheshkale447 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@IamRanjeetSingh @Maheshkale447