Skip to content

feat: branch worktrees from default baseline and flag stale ones - #8

Merged
EthanThatOneKid merged 2 commits into
mainfrom
worktree-conventions
Aug 9, 2026
Merged

feat: branch worktrees from default baseline and flag stale ones#8
EthanThatOneKid merged 2 commits into
mainfrom
worktree-conventions

Conversation

@EthanThatOneKid

@EthanThatOneKid EthanThatOneKid commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

Implements ADR-0003 (docs/adr/0003-worktree-baseline-and-staleness.md).

  • wspace worktree add <repo> <feature> [<commit-ish>] now branches from origin/<default> (resolved via origin/HEAD) instead of the repos/ checkout's current HEAD, and drops the no-op --track (now --no-track; upstream is set later by git push -u).
  • Existing feature branches are re-attached with a warning instead of failing.
  • wspace worktree list --stale now flags worktrees whose branch is merged into origin/<default> or no longer exists, instead of listing detached worktrees.
  • wspace worktree remove tidies the empty worktrees/<repo> parent directory.

Docs: ADR-0003 + README usage updates.

@EthanThatOneKid
EthanThatOneKid merged commit a37adf0 into main Aug 9, 2026
1 check passed
@EthanThatOneKid
EthanThatOneKid deleted the worktree-conventions branch August 9, 2026 01:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant