From 7f9b3965b90d20978a8d903ccc445c26476bf92b Mon Sep 17 00:00:00 2001 From: Gale W Date: Fri, 21 Aug 2026 00:29:18 -0400 Subject: [PATCH] release: avoid local branch deletion during merge --- .../assets/repo-maintenance/repo-maintenance.fsx | 2 +- scripts/repo-maintenance/repo-maintenance.fsx | 2 +- .../assets/repo-maintenance/repo-maintenance.fsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/repository-skills/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx b/plugins/repository-skills/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx index b3052eb2..34d2b755 100644 --- a/plugins/repository-skills/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx +++ b/plugins/repository-skills/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx @@ -238,7 +238,7 @@ let releaseAdvance (tag: string) (args: string list) = if gate.Phase <> "ready-to-advance" && not (gate.Phase = "comments-require-review" && hasFlag "--review-comments-addressed" args) then continuation tag gate fail $"Release PR #{number} is not ready to advance: {gate.Phase}." - gh [ "pr"; "merge"; string number; "--merge"; "--delete-branch" ] |> requireSuccess "Merge release PR" |> ignore + gh [ "pr"; "merge"; string number; "--merge" ] |> requireSuccess "Merge release PR" |> ignore let mainRoot = findMainWorktree () cleanWorktree mainRoot runIn mainRoot "git" [ "fetch"; "origin"; "main"; "--prune" ] |> requireSuccess "Fetch main" |> ignore diff --git a/scripts/repo-maintenance/repo-maintenance.fsx b/scripts/repo-maintenance/repo-maintenance.fsx index b3052eb2..34d2b755 100644 --- a/scripts/repo-maintenance/repo-maintenance.fsx +++ b/scripts/repo-maintenance/repo-maintenance.fsx @@ -238,7 +238,7 @@ let releaseAdvance (tag: string) (args: string list) = if gate.Phase <> "ready-to-advance" && not (gate.Phase = "comments-require-review" && hasFlag "--review-comments-addressed" args) then continuation tag gate fail $"Release PR #{number} is not ready to advance: {gate.Phase}." - gh [ "pr"; "merge"; string number; "--merge"; "--delete-branch" ] |> requireSuccess "Merge release PR" |> ignore + gh [ "pr"; "merge"; string number; "--merge" ] |> requireSuccess "Merge release PR" |> ignore let mainRoot = findMainWorktree () cleanWorktree mainRoot runIn mainRoot "git" [ "fetch"; "origin"; "main"; "--prune" ] |> requireSuccess "Fetch main" |> ignore diff --git a/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx b/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx index b3052eb2..34d2b755 100644 --- a/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx +++ b/skills/maintain-project-repo/assets/repo-maintenance/repo-maintenance.fsx @@ -238,7 +238,7 @@ let releaseAdvance (tag: string) (args: string list) = if gate.Phase <> "ready-to-advance" && not (gate.Phase = "comments-require-review" && hasFlag "--review-comments-addressed" args) then continuation tag gate fail $"Release PR #{number} is not ready to advance: {gate.Phase}." - gh [ "pr"; "merge"; string number; "--merge"; "--delete-branch" ] |> requireSuccess "Merge release PR" |> ignore + gh [ "pr"; "merge"; string number; "--merge" ] |> requireSuccess "Merge release PR" |> ignore let mainRoot = findMainWorktree () cleanWorktree mainRoot runIn mainRoot "git" [ "fetch"; "origin"; "main"; "--prune" ] |> requireSuccess "Fetch main" |> ignore