From e2ac371513fc4422230ee97deafd8392a45d7f0d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 21:48:30 +0000 Subject: [PATCH 1/2] Initial plan From 7a44a9db3f773e2d0f40146c102d01a56721526d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 21:50:17 +0000 Subject: [PATCH 2/2] Fix Rebuild Action workflow by adding --no-edit flag to git merge --continue Co-authored-by: henrymercer <14129055+henrymercer@users.noreply.github.com> --- .github/workflows/rebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml index 9740a0d163..2e88b35d58 100644 --- a/.github/workflows/rebuild.yml +++ b/.github/workflows/rebuild.yml @@ -111,7 +111,7 @@ jobs: # Otherwise, just commit the changes. if git rev-parse --verify MERGE_HEAD >/dev/null 2>&1; then echo "In progress merge detected, finishing it up." - git merge --continue + git merge --continue --no-edit else echo "No in-progress merge detected, committing changes." git commit -m "Rebuild"