Fix release-branch-manager failure caused by conflicting flat release branch#35
Draft
Copilot wants to merge 2 commits into
Draft
Fix release-branch-manager failure caused by conflicting flat release branch#35Copilot wants to merge 2 commits into
release branch#35Copilot wants to merge 2 commits into
Conversation
Copilot
AI
changed the title
[WIP] Fix failing GitHub Actions job for release-branch-manager
Fix release-branch-manager failure caused by conflicting flat Jun 22, 2026
release branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
release-branch-managerjob was failing with[remote rejected] (directory file conflict)when trying to pushrelease/v3(andrelease/v1,release/v2). An orphaned flatreleasebranch existed in the repo — git stores branch refs as filesystem paths, sorefs/heads/release(file) blocks creation ofrefs/heads/release/v3(requiresrefs/heads/releaseto be a directory).Changes
.github/workflows/release.yml: Added acleanupjob that runs beforegithub-action(vianeeds: cleanup) and deletes the conflicting flatreleasebranch via the GitHub API. Handles both HTTP 404 and 422 gracefully so the step is a no-op if the branch doesn't exist.