Ensure that conflict status is reset if there are no conflicts

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 <[email protected]>

Author: zeripath

services/pull/patch.go

@@ -287,10 +287,12 @@ func checkConflicts(ctx context.Context, pr *models.PullRequest, gitRepo *git.Re
 		if err != nil {
 			return false, err
 		}
+		pr.Status = models.PullRequestStatusMergeable
+		pr.ConflictedFiles = []string{}
+
 		if treeHash == baseTree.ID.String() {
 			log.Debug("PullRequest[%d]: Patch is empty - ignoring", pr.ID)
 			pr.Status = models.PullRequestStatusEmpty
-			pr.ConflictedFiles = []string{}
 			pr.ChangedProtectedFiles = []string{}
 		}