Don't allow merging PR's which are being conflict checked (#19357)#19358
Merged
Conversation
Contributor
Gusted
commented
Apr 9, 2022
Gusted
commented
- Backport of Don't allow merging PR's which are being conflict checked #19357
- When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR).
- Resolves Merged pull not marked as merged when conflict checking still in progress #19352
…19357) - Backport of go-gitea#19357 - When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR). - Resolves go-gitea#19352
wxiaoguang
approved these changes
Apr 9, 2022
GiteaBot
added
the
lgtm/need 1
delvh
approved these changes
Apr 9, 2022
GiteaBot
added
lgtm/done
lafriks
approved these changes
Apr 10, 2022
Member
|
make L-G-T-M work |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.