Skip to content

Merge branch 'feat/adopt-clean' into develop#15

Open
dezren39 wants to merge 6 commits into
mainfrom
develop
Open

Merge branch 'feat/adopt-clean' into develop#15
dezren39 wants to merge 6 commits into
mainfrom
develop

Conversation

@dezren39
Copy link
Copy Markdown
Owner

@dezren39 dezren39 commented Apr 13, 2026

Part of a stack managed by ez.

Stack (this PR is 1 of 1):

  1. develop ← you are here (dezren39#15)

Two bugs prevented proper worktree management:

1. `ez create --from` never created a worktree because the condition
`!no_worktree && from.is_none()` treated --from as implying no-worktree.
The --from flag controls which branch is the parent, not whether a worktree
is created. Now `ez create feat --from main` creates a worktree at
.worktrees/feat as expected.

2. `ez switch` fell back to `git checkout` for branches without worktrees,
hijacking the main worktree. Now it auto-creates a linked worktree for
managed branches that don't have one, matching the worktree-first design.
…no-switch, duplicate branch, and switch_to edge cases
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