Reset the conflicted files list in testpatch (#18139) 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. Signed-off-by: Andrew Thornton <art27@cantab.net>

Changes

1 changed files (+1/-0)

• services/pull/patch.go
  • @@ -235,6 +235,7 @@ func checkConflicts(pr *models.PullRequest, gitRepo *git.Repository, tmpBasePath
    }() numberOfConflicts := 0 + pr.ConflictedFiles = make([]string, 0, 5) conflict := false for file := range unmerged {