Loading...
Loading...
Found 11 Skills
Worktree-native merge engineer — git worktree lifecycle, isolated merges and conflict resolution, worktree path conventions, parallel worktree operations, and cleanup automation. Invoke via /git-merge-expert-worktree or when user says "merge in worktree", "isolated merge", "worktree merge".
Standard workflow for pulling updates from main or other branches on multi-contributor projects (including Dune apps) without silently discarding work. Guides fetching/merging, requires listing merge conflicts explicitly, analyzing ours vs theirs using conversation history and repo context, presenting prioritized recommendations, and obtaining user answers before editing conflict markers or completing the merge. Triggers: pull main, merge main, merge origin, rebase, merge conflict, unmerged paths, both modified, integrate branch, sync with main, git merge abort, resolve conflicts, UU status, theirs vs ours, feat branch update.
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 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.
Create a feature branch in a Git worktree, work independently, then merge back and clean up safely.
Git branch completion workflow. Use when implementation is complete, tests pass, and a feature branch needs to be integrated via merge, pull request, or cleanup.
Finish a feature by merging it to the base branch and cleaning up the worktree. Use when completing a feature or story, handles merge, push, and cleanup automatically.
Check for and apply updates to installed skill branches from upstream.
Merge the winning agent's branch into base, archive losers, and clean up worktrees.