unboundsoftware/shared-workflows
6
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Activity

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

Merged
argoyle merged 1 commits from fix-release-pr-conflicts into main 2026-02-12 11:02:44 +00:00
Conversation 0 Commits 1 Files Changed 1
+80 -171
argoyle commented 2026-02-12 11:02:36 +00:00
Owner
Copy Link
Copy Source

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.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
acctest (Shiny Acctest) argoyle (Joakim Olsson) buildtools (Buildtools) kubernetes (Kubernetes) releaser (Unbound Releaser) renovate (Renovate Bot)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: unboundsoftware/shared-workflows#17
Delete Branch "fix-release-pr-conflicts"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?