diff options
Diffstat (limited to 'services/pull')
| -rw-r--r-- | services/pull/patch.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/pull/patch.go b/services/pull/patch.go index 4bc875f630..0eba3f86ed 100644 --- a/services/pull/patch.go +++ b/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 { |