feat: add configurable merge/rebase arguments#224
Merged
Conversation
Add MergeConfig to allow users to customize arguments passed to git merge and git rebase operations. Users can configure args globally or per-project via the new Configuration > Configure Merge/Rebase screen. For example, setting mergeArgs to ['--squash'] enables squash merges. Closes #223 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Test merge/rebase operations with configurable args against actual git repositories, covering default args, custom MergeConfig, squash via mergeArgs, rebase with custom flags, and error cases. Co-Authored-By: Claude Opus 4.6 <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
MergeConfigtype withmergeArgsandrebaseArgsfields, configurable at global and project scopemergeWorktreeEffectnow accepts anoperationparameter ('merge' | 'rebase') and uses configurable args fromMergeConfig(defaults: merge uses--no-ff, rebase uses no extra args)mergeArgsto["--squash"]— no dedicated squash option neededCloses #223
Test plan
bun run typecheckpassesbun run lintpassesbun run testpasses (1279 tests)mergeWorktreeEffectwith customMergeConfigworktreeService.merge.test.ts) covering default args, custom mergeArgs/rebaseArgs, squash via config, conflict handlingbun run start, navigate to Configuration → Configure Merge/Rebase, edit args, then perform merge/rebase operations🤖 Generated with Claude Code