From cb135520048e89abae726350a2e45e1ad49e34c3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Mar 2026 00:45:31 +0000 Subject: [PATCH 1/2] Initial plan From b4c20cb72793bc023ccb81126a91bfa2ebcccaed Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Mar 2026 00:49:56 +0000 Subject: [PATCH 2/2] fix: update release workflow to auto-merge release hotfixes back into main Co-authored-by: CanyoufeeltheAGI <255605710+CanyoufeeltheAGI@users.noreply.github.com> --- .github/workflows/release.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68ba5b2..dc4fe4f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: echo "New version: $NEW_VERSION" echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT - - name: Verify release is not ahead of main + - name: Merge any release-only commits back into main run: | git fetch origin release:release || true @@ -78,9 +78,15 @@ jobs: # Check if release has commits not in main AHEAD=$(git rev-list --count main..release) if [ "$AHEAD" -gt 0 ]; then - echo "❌ Error: release branch is $AHEAD commit(s) ahead of main" - echo "This should never happen. Please investigate." - exit 1 + echo "⚠️ release branch is $AHEAD commit(s) ahead of main (hotfixes pushed directly to release)" + echo "Merging release commits back into main to preserve them..." + if ! git merge release --no-edit -m "chore: merge release hotfixes back into main"; then + echo "❌ Merge failed due to conflicts. Resolve conflicts manually, then re-run this workflow." + git merge --abort + exit 1 + fi + git push origin main + echo "✅ Successfully merged $AHEAD release commit(s) into main" fi fi