From ea4b520a901ac8ad7649f61f746451f8e2839081 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 21 May 2025 15:32:05 +0100 Subject: [PATCH] appview: fix stack merging the current PR is already in the list of PRs to be merged, include only PRs that are strictly below it for merge. --- appview/state/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appview/state/pull.go b/appview/state/pull.go index e251636..17d59e0 100644 --- a/appview/state/pull.go +++ b/appview/state/pull.go @@ -1834,7 +1834,7 @@ func (s *State) MergePull(w http.ResponseWriter, r *http.Request) { } // combine patches of substack - subStack := stack.Below(pull) + subStack := stack.StrictlyBelow(pull) // collect the portion of the stack that is mergeable mergeable := subStack.Mergeable() // add to total patch -- 2.51.2