Skip to content

fix(deploy): rename release branch prefix to releases to avoid ref collision#245

Merged
michaeljymsgutierrez merged 1 commit into
developfrom
fix/deploy-release-branch-naming
Jun 30, 2026
Merged

fix(deploy): rename release branch prefix to releases to avoid ref collision#245
michaeljymsgutierrez merged 1 commit into
developfrom
fix/deploy-release-branch-naming

Conversation

@michaeljymsgutierrez

Copy link
Copy Markdown
Owner

Description

During a stable:patch deploy attempt, the script failed with a fatal git ref collision:

fatal: cannot lock ref 'refs/heads/release/v2.9.1': 'refs/heads/release' exists; cannot create 'refs/heads/release/v2.9.1'

Git cannot create a branch named release/vX.X.X when a permanent branch named release already exists - on the filesystem, release would need to be both a ref file and a directory simultaneously. This caused the deploy to fail mid-run and left uncommitted changes behind in the working tree.

The fix renames the temporary versioned branch prefix in deploy.sh from release/ to releases/ (plural), which avoids the collision entirely. CONTRIBUTING.md is updated to keep the docs consistent with the actual branch naming used during deploys.

Github Issue: N/A

Changes

  • deploy.sh - renamed all release/$LATEST_VERSION branch references to releases/$LATEST_VERSION (8 occurrences across publish_release_version_branch and cleanup_release_version_branch)
  • CONTRIBUTING.md - updated 4 references to match the corrected branch naming: Mermaid flow diagram node, Releasing Phase description, branch type table, and branch naming example

Screenshots/Images

N/A - no UI changes.

How Has This Been Tested?

  • Dry run: ./deploy.sh --dry-run stable:patch executed successfully with no errors after the fix was applied, confirming the ref collision no longer occurs.
  • Manual testing: Verified git status was clean before and after the dry run - no stray branches or uncommitted changes left behind.

Checklist

  • Code follows the project's coding standards and best practices.
  • Tests are written for new functionality and existing tests pass.
  • Documentation is updated to reflect changes (CONTRIBUTING.md updated to match releases/ prefix).
  • The PR is assigned to the correct reviewers.

Reviewer Guidance

  • The only functional change is the branch prefix in deploy.sh from release/ to releases/. This prevents the fatal ref collision when a permanent release branch exists alongside a versioned releases/vX.X.X branch.
  • CONTRIBUTING.md changes are purely cosmetic - keeping docs in sync with the script behavior.
  • To verify: run ./deploy.sh --dry-run stable:patch and confirm it prints [dry-run] git checkout -b releases/vX.X.X with no errors.

@vercel

vercel Bot commented Jun 30, 2026

Copy link
Copy Markdown

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

Project Deployment Actions Updated (UTC)
arm-js-library-demo Ready Ready Preview, Comment Jun 30, 2026 6:24pm

@michaeljymsgutierrez michaeljymsgutierrez self-assigned this Jun 30, 2026
@michaeljymsgutierrez michaeljymsgutierrez added the bug Confirmed bugs and reported issues label Jun 30, 2026
@michaeljymsgutierrez michaeljymsgutierrez merged commit 9ca0c99 into develop Jun 30, 2026
3 checks passed
@michaeljymsgutierrez michaeljymsgutierrez deleted the fix/deploy-release-branch-naming branch June 30, 2026 18:26
michaeljymsgutierrez added a commit that referenced this pull request Jun 30, 2026
- [c099dd9][michaeljymsgutierrez]: Updated release version from v2.9.0 to v2.9.1 - 2026-07-01 02:27:36
- [9ca0c99][Chael Gutierrez]: fix(deploy): rename release branch prefix to releases to avoid ref collision (#245) - 2026-07-01 02:26:00
- [f823754][Chael Gutierrez]: chore(deps): fix dependabot security alerts - upgrade vite, vitest, form-data and markdown-it (#244) - 2026-07-01 01:55:56
- [2fcec47][Chael Gutierrez]: chore(deploy): add pre-flight checks, dry-run mode, canary sync, path safety and fail-fast (#243) - 2026-07-01 01:36:47
- [8cf2be1][Chael Gutierrez]: test(units): improve test structure and expand coverage across all unit modules (#242) - 2026-07-01 00:38:33
- [81e929f][Chael Gutierrez]: docs(contributing): add branch purposes, flow diagram, and toc updates (#241) - 2026-06-29 02:27:20
- [9e02459][Chael Gutierrez]: docs(contributing): add CONTRIBUTING.md and link from README (#240) - 2026-06-29 02:07:47
- [b8e9297][Chael Gutierrez]: chore(deps): upgrade production dependencies (#239) - 2026-06-24 02:57:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Confirmed bugs and reported issues

Projects

Development

Successfully merging this pull request may close these issues.

1 participant