diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/models/pull.go b/models/pull.go index 094cb9b26a..5c7d4a3f90 100644 --- a/models/pull.go +++ b/models/pull.go @@ -260,6 +260,7 @@ func (pr *PullRequest) testPatch() (err error) { for i := range patchConflicts { if strings.Contains(stderr, patchConflicts[i]) { log.Trace("PullRequest[%d].testPatch(apply): has conflit", pr.ID) + fmt.Println(stderr) pr.Status = PULL_REQUEST_STATUS_CONFLICT return nil } |