merge-changes-from-worktree
Merge Changes From Worktree
Merge a branch that is checked out in an existing git worktree into the current branch. The merge must be fast-forward only.
Hard Rules
- Only merge branches that are currently associated with an existing
git worktreeentry. - If the user did not provide a branch, discover supported branches and ask the user to choose using the Question tool.
- Never use a normal merge commit. The final merge command must be
git merge --ff-only <branch>or equivalent fast-forward-only command. - Do not discard, reset, or overwrite user changes. If a required worktree is dirty, ask before continuing.
Quick Start
Given a branch argument:
More from ishakantony/skills
discuss
Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree. DO NOT EVER USE THIS SKILL UNLESS THE USER EXPLICITLY ASKS YOU TO.
19prd-to-issues
Break a PRD into independently-workable issues and write each as a local markdown file in issues/. Use when the user wants to turn a PRD into a list of concrete tasks.
15tdd
Test-driven development with red-green-refactor loop. Use when user wants to build features or fix bugs using TDD, mentions "red-green-refactor", wants integration tests, or asks for test-first development.
14write-a-prd
Generate a PRD from the client brief and write it as a local markdown file in issues/. Use when the user wants to turn a client request into a structured PRD.
14tackle-issues
Autonomously work through AFK issues from the local issues/ directory in a loop, spawning a subagent per task. Use when user types /tackle-issues or asks to "work the backlog", "burn down issues", "tackle AFK tasks", or run an AFK issue queue. Skips HITL issues. Each task is implemented via TDD in a subagent so the main context stays clean.
13commit
Stage changes, draft conventional commit messages, and commit with user confirmation. Use when user types /commit, asks to commit changes, or mentions creating a git commit.
10