Explicitly reset conflict status in successful PR check #18723
Closed
Conversation
This file contains 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
The ConflictedFiles status should always be reset if there are no conflicts this prevents conflicted files being left over. Fix go-gitea#17204 Signed-off-by: Andrew Thornton <art27@cantab.net>
wxiaoguang
reviewed
Feb 11, 2022
| return false, err | ||
| } | ||
| pr.Status = models.PullRequestStatusMergeable | ||
| pr.ConflictedFiles = []string{} |
There was a problem hiding this comment.
Not sure .... should ChangedProtectedFiles also be reset? It seem that ChangedProtectedFiles will be re-calculated later in checkPullFilesProtection.
GiteaBot
added
the
lgtm/need 2
wxiaoguang
approved these changes
Feb 11, 2022
GiteaBot
added
lgtm/need 1
Given the repeated issues here I've just added some plain trace logging which should allow for easier tracing of when processes are created. Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
force-pushed
the
reset-conflict-status
branch
from
1475cea
to
db1931c
Compare
|
I'm gonna close this as this doesn't appear to be the problem. |
|
However I may use the branch to add better tracing logging to things. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Explicitly reset conflict status in pr check.
Adds more trace logging to the pr checker and improves queue trace logging.
Fix #17204