fix(release): auto-merge release hotfixes into main instead of blocking

[Copilot]

The release workflow hard-failed whenever release was ahead of main (e.g. hotfixes pushed directly to release), making it impossible to cut a release without manual git surgery.

Changes

• Replaces the "Verify release is not ahead of main" exit 1 guard with a "Merge any release-only commits back into main" step that preserves those commits instead of blocking
• Auto-merges release → main and pushes when release is ahead, so no deployed commits are lost
• Conflict guard: on merge failure, aborts cleanly and exits with an actionable error rather than leaving the repo in a dirty state

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

The subsequent "Fast-forward release to main" step is unchanged — it picks up the newly merged main tip via origin/main after the push.

---

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
bloomstudio	Ignored	Preview	Mar 7, 2026 0:50am