fix: add --base flag to swarm merge for repos without develop branch#539
Merged
dollspace-gay merged 1 commit intodevelopfrom Mar 30, 2026
Merged
fix: add --base flag to swarm merge for repos without develop branch#539dollspace-gay merged 1 commit intodevelopfrom
dollspace-gay merged 1 commit intodevelopfrom
Conversation
swarm merge hardcoded "develop" as the base for branch creation and diff generation, failing with "fatal: 'develop' is not a commit" on repos that use main as their default branch. Adds --base flag (auto-detects develop/main/origin variants by default). Extracts detect_base_branch() helper and refactors discover_worktrees and extract_diff_ranges to use it, eliminating duplicated base-ref iteration logic. Closes #518 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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.
Summary
--base <ref>flag tocrosslink swarm merge(auto-detectsdevelop/main/origin/develop/origin/mainby default)"develop"in branch creation and diff generation that causedfatal: 'develop' is not a commiton repos usingmaindetect_base_branch()helper and refactorsdiscover_worktreesandextract_diff_rangesto use it, eliminating duplicated base-ref iterationCloses #518
Test plan
cargo buildpassescargo clippy -- -D warnings -W clippy::unwrap_used -W clippy::expect_usedclean (1.94.0)🤖 Generated with Claude Code