Worktree Rebase/Merge Workflow

Use this skill to finish a worktree feature branch by committing staged work, rebasing the branch onto the target branch, then merging it from the target branch checkout.

Defaults

• Use the target branch explicitly named by the user. If none is named, use dev; if the local dev branch does not exist, stop and ask the user to name or create a target branch before proceeding.
• Treat the branch checked out in the current worktree as the source branch. If detached, create a source branch first, then continue this workflow.
• Do not fetch, pull, or push unless the user explicitly asks.
• If the source worktree has no staged changes when entering the commit step, run git add . once before deciding whether there is anything to commit.
• Outside that automatic empty-staging-area pass, only stage files explicitly selected by the user, files already staged for the commit workflow, or resolved conflict files during rebase and merge.