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

Reset the conflicted files list in testpatch #18139

Merged
merged 1 commit into from
Dec 31, 2021
Merged

Reset the conflicted files list in testpatch #18139

merged 1 commit into from
Dec 31, 2021

Commits on Dec 31, 2021

  1. Reset the conflicted files list in testpatch 

    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
    zeripath committed Dec 31, 2021
    Configuration menu
    Copy the full SHA
    d98c376 View commit details
    Browse the repository at this point in the history