feat: scope finish resume state per source branch#10
Merged
Conversation
An interrupted release/hotfix finish used a single global .git/bflow-finish.state and resumed from any branch, hijacking every subsequent bflow invocation until the finish completed. State now lives per source branch under .git/bflow-finish/ (e.g. hotfix-2.5.2.state). Resume fires only when standing on that source branch; from develop/main/feature bflow behaves normally, so a stalled finish no longer blocks other work. Two finishes can be in progress at once. --abort is likewise branch-scoped. Pre-2.4 global state files migrate automatically on startup. Every merge step in finish_release/finish_hotfix now appends switch-back guidance naming the exact source branch to return to before re-running. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Code reviewNo issues found. Checked for bugs and CLAUDE.md compliance. |
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
1 participant
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.
What
Interrupted release/hotfix finishes used a single global
.git/bflow-finish.stateand resumed from any branch, hijacking everybflowrun until the finish completed.State now lives per source branch under
.git/bflow-finish/(e.g.hotfix-2.5.2.state). Resume fires only when standing on that source branch; from develop/main/feature, bflow behaves normally — a stalled finish no longer blocks other work. Two finishes can be in progress at once.--abortis likewise branch-scoped. Pre-2.4 global state migrates automatically.Every merge step in
finish_release/finish_hotfixnow appends switch-back guidance naming the exact source branch to return to.Tests
10 new
state.rsunit tests + 4 conflict-guidance integration tests (TDD). Full suite: 159 passing. Real-binary smoke test confirms branch-scoped resume/abort + legacy migration.🤖 Generated with Claude Code