From e06558e2083e6281500cc1c91ac54425b91390fe Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 16 Nov 2015 21:18:04 -0500 Subject: #1922 Pull request fail to merge with BIN --- models/pull.go | 1 + 1 file changed, 1 insertion(+) (limited to 'models') diff --git a/models/pull.go b/models/pull.go index 094cb9b2..5c7d4a3f 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 } -- cgit v1.2.3