Let --base take a local branch, drop --existing - #4
Open
migueltorresvalls wants to merge 2 commits into
Open
Conversation
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
--existing could never serve its use case: git refuses to check one branch out in two worktrees, so a branch already live in another task was never available to a second one. Branching from it is the only thing git permits, and it's what the stacked-PR workflow wants anyway. - --base takes <remote>/<branch> or a local branch name; remote wins on ambiguity, and a local base skips the fetch - Pass a fully-qualified start point to `git worktree add` — the short form is ambiguous to git when a local branch is named e.g. origin/main - Remove --existing from `tsk add`, usage, and README Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
migueltorresvalls
changed the title
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
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.
Replace
--existingwith local-branch support in--base.Use case: a migration in one task unblocks a feature in another, and I want
them as two PRs and two Linear issues — so the second task has to start from
the first one's branch and see its code.
--existingcouldn't do this: git refuses to check one branch out in twoworktrees, so task A's branch was never available to task B.
Changes:
--baseaccepts<remote>/<branch>or a local branch name; remote wins on ambiguity, a local base skips the fetchgit worktree addgets a fully-qualified start point — the short form is ambiguous to git when a local branch is named e.g.origin/main--existingremoved fromtsk add, usage, and README