Update services/pull/check.go

zeripath · web-flow · commit 716990c0af1a · 2022-07-11T21:40:34.000+01:00
diff --git a/services/pull/check.go b/services/pull/check.go
@@ -89,7 +89,7 @@ func CheckPullMergable(stdCtx context.Context, doer *user_model.User, perm *acce
 			return ErrIsWorkInProgress
 		}
 
-		if !pr.CanAutoMerge() && !pr.IsEmpty() || pr.IsAncestor() {
+		if !pr.CanAutoMerge() && !pr.IsEmpty() {
 			return ErrNotMergableState
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func CheckPullMergable(stdCtx context.Context, doer user_model.User, perm acce`
`89`	`89`	`return ErrIsWorkInProgress`
`90`	`90`	`}`
`91`	`91`
`92`		`- if !pr.CanAutoMerge() && !pr.IsEmpty() \|\| pr.IsAncestor() {`
	`92`	`+ if !pr.CanAutoMerge() && !pr.IsEmpty() {`
`93`	`93`	`return ErrNotMergableState`
`94`	`94`	`}`
`95`	`95`