Reset the conflicted files list in testpatch #18139
Merged
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
Although go-gitea#18004 will seriously reduce the likelihood of finding conflicts in the first place - one bug was introduced whereby the conflicted files status was not being reset properly. This leads to conflicted PRs remaining conflicted when the conflict has been resolved. Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
added
the
skip-changelog
wxiaoguang
approved these changes
Dec 31, 2021
GiteaBot
added
the
lgtm/need 1
Codecov Report
@@ Coverage Diff @@
## main #18139 +/- ##
=======================================
Coverage ? 44.94%
=======================================
Files ? 825
Lines ? 91576
Branches ? 0
=======================================
Hits ? 41162
Misses ? 43834
Partials ? 6580
Continue to review full report at Codecov.
|
lunny
approved these changes
Dec 31, 2021
GiteaBot
added
lgtm/done
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jan 1, 2022
* giteaoffical/main: tests: s/GITEA_UNIT_TESTS_VERBOSE/GITEA_UNIT_TESTS_LOG_SQL/ (go-gitea#18142) services/repository: fix ListUnadoptedRepositories incorrect total count (go-gitea#17865) Improve document for developers: Windows CGO, unit test option (go-gitea#18140) Reset the conflicted files list in testpatch (go-gitea#18139) Use correct translation key (go-gitea#18135)
Chianina
pushed a commit
to Chianina/gitea
that referenced
this pull request
Mar 28, 2022
Although go-gitea#18004 will seriously reduce the likelihood of finding conflicts in the first place - one bug was introduced whereby the conflicted files status was not being reset properly. This leads to conflicted PRs remaining conflicted when the conflict has been resolved. Signed-off-by: Andrew Thornton <art27@cantab.net>
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.
Although #18004 will seriously reduce the likelihood of finding
conflicts in the first place - one bug was introduced whereby the
conflicted files status was not being reset properly. This leads to
conflicted PRs remaining conflicted when the conflict has been resolved.
Fix #18130
Signed-off-by: Andrew Thornton art27@cantab.net