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

Set correct PR status on 3way on conflict checking (#19457) #19458

Merged
merged 2 commits into from
Apr 22, 2022
Merged

Set correct PR status on 3way on conflict checking (#19457) #19458

merged 2 commits into from
Apr 22, 2022

Conversation

Gusted
Copy link
Contributor

@Gusted Gusted commented Apr 21, 2022

  • Backport Set correct PR status on 3way on conflict checking #19457
    • When 3-way merge is enabled for conflict checking, it has a new interesting behavior that it doesn't return any error when it found a conflict, so we change the condition to not check for the error, but instead check if conflictedfiles is populated, this fixes a issue whereby PR status wasn't correctly on conflicted PR's.
    • Refactor the mergeable property(which was incorrectly set and lead me this bug) to be more maintainable.
    • Add a dedicated test for conflicting checking, so it should prevent future issues with this.
    • Ref: Fix the latest error for https://gitea.com/gitea/go-sdk/pulls/579

Set correct PR status on 3way on conflict checking (go-gitea#19457)
28f3ffc 
- Backport go-gitea#19457
  - When 3-way merge is enabled for conflict checking, it has a new interesting behavior that it doesn't return any error when it found a conflict, so we change the condition to not check for the error, but instead check if conflictedfiles is populated, this fixes a issue whereby PR status wasn't correctly on conflicted PR's.
  - Refactor the mergeable property(which was incorrectly set and lead me this bug) to be more maintainable.
  - Add a dedicated test for conflicting checking, so it should prevent future issues with this.
  - Ref: Fix the latest error for https://gitea.com/gitea/go-sdk/pulls/579
@Gusted Gusted added this to the 1.16.7 milestone Apr 21, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 21, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 21, 2022
@lunny
Copy link
Member

lunny commented Apr 22, 2022

make L-G-T-M work

@lunny lunny merged commit 09adc26 into go-gitea:release/v1.16 Apr 22, 2022
@Gusted Gusted deleted the backport-19457 branch April 22, 2022 06:00
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@zeripath zeripath zeripath approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.16.7
Development

Successfully merging this pull request may close these issues.
5 participants
@Gusted @lunny @zeripath @6543 @GiteaBot