diff options
| author | Unknwon <u@gogs.io> | 2015-11-16 21:18:04 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-16 21:18:04 -0500 |
| commit | e06558e2083e6281500cc1c91ac54425b91390fe (patch) | |
| tree | a8fffe9596dfedd08adf9e7bfe63bd217ba4309d /models | |
| parent | 54fd4cc5fb4d37eb82183cf7a5f6dbe8ac72d62b (diff) | |
| download | gitea-e06558e2083e6281500cc1c91ac54425b91390fe.tar.gz gitea-e06558e2083e6281500cc1c91ac54425b91390fe.zip | |
#1922 Pull request fail to merge with BIN
Diffstat (limited to 'models')
| -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 } |