Loading...
Loading...
Found 22 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".
Use when you need to resolve an in-progress git merge/rebase conflict.
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
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.
Merge all worktrees from .trees/ into current branch and clean up
Merge the winning agent's branch into base, archive losers, and clean up worktrees.
Cerrar e integrar el trabajo de una historia de usuario haciendo merge de la rama feature/US-XXX hacia la rama desde la que se creó, previa verificación de que progress.md tenga todas las tareas en Done. Activar cuando el usuario pida cerrar, entregar, mergear, integrar, finalizar o hacer submit del trabajo de una historia, una US o de la rama actual.
Create a feature branch in a Git worktree, work independently, then merge back and clean up safely.
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.
Handle main-to-next merge tasks including conflict resolution, changeset cleanup, and CI fix-ups. Use when merging main into next.
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.
Update the current local work branch by merging the latest base/default branch with pure git and no automatic push. Use when the user invokes `/update-branch`, says "update branch", or asks to merge the latest base branch or default branch into this branch.