Simplify branch task with git checkout -B #78
Conversation
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
cseeman
force-pushed
the
fix-branch-task-current-branch
branch
from
8e2d92b to
c2d1629
Compare
Handles all scenarios reliably: - CI fresh runs (creates branch) - Local retries on different branch (resets existing branch) - Local retries on same branch (stays on branch) Added test for retry scenarios to prevent regressions. Fixed: Branch task fails trying to delete current branch Version: patch Co-Authored-By: Claude <noreply@anthropic.com>
cseeman
force-pushed
the
fix-branch-task-current-branch
branch
from
c2d1629 to
e8e74eb
Compare
cseeman
changed the title
cseeman
commented
Dec 19, 2025
| end | ||
| run_command("git checkout -b #{branch_name}", "Failed to create and checkout branch #{branch_name}") | ||
| # Create branch or reset if exists (-B flag handles both cases) | ||
| run_command("git checkout -B #{branch_name}", "Failed to checkout branch #{branch_name}") |
Contributor
Author
There was a problem hiding this comment.
If you were worried about CI vs local run of this rake, yes, git checkout -B works identically in both environments:
| Scenario | CI | Local | Behavior |
|---|---|---|---|
| Branch doesn't exist | ✅ | ✅ | Creates branch at HEAD |
| Branch exists, on different branch | ✅ | ✅ | Switches to branch, resets to HEAD |
| Branch exists, already on it | ✅ | ✅ | Stays on branch, resets to HEAD |
| Dirty working tree | ✅ | ✅ | Fails safely (won't lose uncommitted changes) |
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.
Replaces complex branch deletion logic with
git checkout -Bwhich handles all scenarios reliably.Problem
During CI release workflow,
rake releasefailed when trying to recreate thefinalize/branch:error: cannot delete branch 'finalize/0.4.8' used by worktree
The old logic tried to delete and recreate existing branches, which fails when you're on that
branch.
Solution
Use
git checkout -Bwhich:This handles CI runs, local retries, and all edge cases with one command.
Test plan