Loading...
Loading...
Found 4 Skills
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.
Finalize development branches for integration. Prepares branches for merging with cleanup, rebasing, and verification steps.
Integrate any number of feature branches from parallel worktrees through one safe integration branch, validating after each merge and running the project's full check suite before touching the main line. Use when parallel worktree development is done and the branches need to be merged, or when the user says "merge my worktrees", "integrate these branches", or invokes /worktree-merge.
Transition the Linear issues linked to the current branch through their workflow states (In Progress / In Review / Done) — resolve live state IDs by team name, extract issue IDs from the branch, and apply the transition idempotently. Use when starting work on an issue, when a PR opens or updates, during branch cleanup, or whenever a branch's Linear issues need their state synced. Resolves state IDs by team name (not key — keys go stale on rename), reads the team name and issue-ID prefixes from config.json, and skips any issue already at or past the target state.