feat(sync): add --cross-worktree flag to sync branches across worktrees#81
Merged
Conversation
Adds WithDir(path) to the GitClient interface, which returns a scoped client that prepends `git -C <path>` to all commands. When --cross-worktree is passed to `stack sync`, branches checked out in other worktrees are rebased in-place via the scoped client instead of being skipped. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Persist conflict worktree path to git config so --abort can create a dir-scoped client and abort the rebase in the correct worktree - Warn when --cherry-pick is skipped for cross-worktree branches instead of silently falling through - Guard ResetToRemote with dirty-worktree check for cross-worktree branches to prevent destroying uncommitted changes - Fix stdout/stderr inconsistency for informational messages Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Owner
Author
|
🎉 This PR is included in version 1.23.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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
WithDir(path) GitClientto the git client interface — returns a scoped client that prependsgit -C <path>to all commandsstack sync --cross-worktreerebases branches checked out in other worktrees in-place instead of skipping themcd <worktree-path>so users know where to resolve--cross-worktree🤖 Generated with Claude Code