Skip to content

feat: add worktree strategies and branch sanitization#38

Closed
brosu wants to merge 1 commit intotimvw:mainfrom
brosu:feat/worktree-strategy
Closed

feat: add worktree strategies and branch sanitization#38
brosu wants to merge 1 commit intotimvw:mainfrom
brosu:feat/worktree-strategy

Conversation

@brosu
Copy link
Contributor

@brosu brosu commented Feb 1, 2026

Summary

  • add configurable worktree strategies with documented default patterns
  • introduce {.branch} and {.branchSafe} template vars (sibling-repo uses safe branch by default)
  • add e2e coverage for all strategies and branch/path variants

Testing

  • go test ./...
  • go run e2e/run.go

@timvw
Copy link
Owner

timvw commented Feb 8, 2026

Hey @brosu, this is a really nice feature — love the strategy-based approach with the template variables. The set of strategies covers all the common worktree layouts I've seen people use, and the {.branchSafe} vs {.branch} distinction is a thoughtful touch.

Since this was opened, a few PRs landed on main that touch overlapping areas:

The conflicts should be straightforward to resolve — your strategy work is orthogonal to the branch-lookup changes. Would you be up for rebasing onto latest main? Happy to help if you run into any issues.

timvw added a commit that referenced this pull request Feb 10, 2026
Merging rebased and improved version of #38 with bug fixes, cross-platform E2E tests, docs, and shell completions.
@timvw
Copy link
Owner

timvw commented Feb 10, 2026

Thank you @brosu for the excellent implementation! This has been rebased, improved (bug fix in getRepoInfo(), cross-platform E2E tests, docs, shell completions), and merged via #42.

@timvw timvw closed this Feb 10, 2026
@brosu
Copy link
Contributor Author

brosu commented Feb 10, 2026

Thank you as well, sorry for not having the time these days to do the rebase myself.
Will try to find a solution for local cross platform testing for future enhancements.

@brosu brosu deleted the feat/worktree-strategy branch February 13, 2026 06:57
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.

2 participants