Loading...
Loading...
Found 18 Skills
Merge all worktrees from .trees/ into current branch and clean up
Merge the latest default branch (e.g. origin/main) into the current branch, resolve merge conflicts, and verify with pnpm lint && pnpm test. Merge-based sync (not rebase) unless the repo specifies otherwise. Use when syncing a feature branch with origin, after a non-fast-forward push, or when the branch is behind. Does not push or manage PRs—use push and create-pr-jp for those.
Use when implementation is complete, tests pass, and code needs to reach main — via PR with auto-merge (CI up) or local shallow-clone merge (CI down)
Keep AI tooling files (.claude, .codex, .cursor, .windsurf, .augment, .kiro, .cline, .roo, .gemini, etc.) on dev branch but exclude them from main/master. Use when managing branches, creating PRs to main, merging to main, or setting up a repo's branch strategy for AI-assisted development. Triggers on git merge/PR operations targeting main or master.
Merge the winning agent's branch into base, archive losers, and clean up worktrees.
Sync the current feature branch with origin/main by committing local work, fetching, merging, and resolving conflicts. Use when user says 'merge main', 'update from main', 'sync with main', 'pull main into branch', 'branch is behind main', or 'update my branch'. Do NOT use for creating PRs (use create-pr), reviewing code (use review-diff), or any rebase workflow — this skill does merge, not rebase.