Add missing patch conflit pattern

README.md

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current version: 0.8.27
+##### Current version: 0.8.28
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.8.27.0202"
+const APP_VER = "0.8.28.0203"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

models/pull.go

@@ -256,6 +256,7 @@ var patchConflicts = []string{
 	"patch does not apply",
 	"already exists in working directory",
 	"unrecognized input",
+	"error:",
 }
 
 // testPatch checks if patch can be merged to base repository without conflit.

templates/.VERSION

@@ -1 +1 @@
-0.8.27.0202
+0.8.28.0203