Git Worktree Feature Flow

Use this skill when the user wants an isolated working directory for a feature (via

git worktree

), then to merge that branch back into a target branch and clean up the worktree.

Examples (user prompts)

"Create a worktree for
```
feature/foo
```
off
```
main
```
."
"Spin up a worktree for my change, put it in
```
../wts/feature-foo
```
."
"Merge my worktree branch back into
```
main
```
with a squash merge, then clean up."
"Finish the worktree for
```
feature/foo
```
but keep the branch around."

bash

$HOME/.codex/skills/git-worktree-feature-flow/scripts/worktree-start.sh --branch feature/my-change

Common options:

bash

$HOME/.codex/skills/git-worktree-feature-flow/scripts/worktree-finish.sh --branch feature/my-change

Common options:

```
--into <branch>
```
: target branch to merge into (default: detected default branch)
```
--strategy merge|squash|ff-only
```
: merge strategy (default:
```
merge
```
)
```
--no-delete-branch
```
: keep the feature branch after merging
```
--keep-worktree
```
: keep the worktree directory after merging
```
--yes
```
: do not prompt

Notes:

Prefer the scripts in
```
scripts/
```
over manually typing long
```
git worktree
```
commands.
Confirm the user’s intended
```
branch
```
,
```
base
```
, and merge
```
strategy
```
before making changes.
Be conservative:
- Refuse to proceed if the feature worktree has uncommitted changes unless the user explicitly wants to continue.
- Refuse to proceed if the target worktree (where the merge happens) is dirty.
- If cleaning up, don’t run the finish step from inside the feature worktree directory.
After finishing, summarize:
- where the worktree lived,
- what merge strategy was used,
- whether the branch/worktree were deleted.