fix(release): replace rebase with branch recreation to prevent PR merge conflicts #17

2026-02-12T11:02:36Z

argoyle commented

2026-02-12 11:02:36 +00:00

Delete and recreate the next-release branch from base on each run instead of
rebasing, which caused 409 conflicts on CHANGELOG.md. Add concurrency group
to prevent parallel workflow runs.

Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com

Delete and recreate the next-release branch from base on each run instead of rebasing, which caused 409 conflicts on CHANGELOG.md. Add concurrency group to prevent parallel workflow runs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

argoyle added 1 commit 2026-02-12 11:02:37 +00:00

fix(release): replace rebase with branch recreation to prevent PR merge conflicts 4688810928

Delete and recreate the next-release branch from base on each run instead of
rebasing, which caused 409 conflicts on CHANGELOG.md. Add concurrency group
to prevent parallel workflow runs.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

argoyle merged commit e3f1ba4e0a into main

2026-02-12 11:02:44 +00:00

argoyle deleted branch fix-release-pr-conflicts

2026-02-12 11:02:45 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: unboundsoftware/shared-workflows#17