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>
This commit is contained in:
parent
7eb380baa4
commit
431e482e3f
|
@ -235,6 +235,7 @@ func checkConflicts(pr *models.PullRequest, gitRepo *git.Repository, tmpBasePath
|
||||||
}()
|
}()
|
||||||
|
|
||||||
numberOfConflicts := 0
|
numberOfConflicts := 0
|
||||||
|
pr.ConflictedFiles = make([]string, 0, 5)
|
||||||
conflict := false
|
conflict := false
|
||||||
|
|
||||||
for file := range unmerged {
|
for file := range unmerged {
|
||||||
|
|
Loading…
Reference in a new issue