Loading...
Loading...
Found 75 Skills
Git Commit Specification, covering commit message format (feat/fix/refactor), Issue linking, branch naming, PR submission preparation, and rebase usage. Used when users submit code, write commit messages, create branches, or prepare PRs.
Executes the full PR-driven development workflow: create an isolated feature branch from the current work, commit all staged changes, rebase cleanly onto the selected base branch (skipping any ancestor commits already merged), push the branch, and open a GitHub pull request linked to a related issue. Includes guidance for stacked/chained PRs. Invoked when the user says "open a PR", "create a pull request", "push and PR", or "branch, rebase and PR".
Resolve git merge and rebase conflicts semi-automatically. Classifies conflicts by type (DU/UD/UU/AA/DD), auto-resolves trivial ones, and applies context-aware resolution for the rest.
Advanced git rebase patterns for linear history, stacked PRs, and clean commit management. Use when rebasing branches, cleaning up commit history, managing PR stacks, or converting merge-heavy branches to linear history. Covers --reapply-cherry-picks, --update-refs, --onto, and interactive rebase workflows.
Advanced git operations including complex rebase strategies, interactive staging, commit surgery, and history manipulation. Use when user needs to perform complex git operations like rewriting history or advanced merging.
Lands a reviewed pull request by rebasing onto the base when the branch is behind and resolving any conflicts, running the project's declared pre-merge steps, pushing, waiting for green CI, and squash-merging. Use when the user says "ship it", or when the user explicitly asks to land, ship, or merge a reviewed PR. Never infer from approval, green CI, or completion. Not for a watch that should merge on approval; use watching-authored-prs. Not for updating a PR without landing; use modernizing-prs.
Rebase the current branch onto the latest main. Use when asked to rebase, sync with main, update branch, or pull latest changes. Fetches and rebases onto latest main; does not push automatically.
Brings an old PR up to date by checking if its idea still fits the current code, then rebasing, reworking or recommending it be closed. Use when asked to rebase, refresh, update or revive a stale PR, or /ds-revive.
Multi-PR development for large features. Stack dependent PRs, manage rebases, and get faster reviews on smaller changes. Use when creating stacked PRs.
Intelligently handle git rebase operations and resolve merge conflicts while preserving features and maintaining code quality. Use when rebasing feature branches, resolving conflicts across commits, and ensuring clean linear history without losing changes.
Safely start new or continue in-progress Git integration and history operations through verified completion. Use when asked to run or resume a rebase, merge, cherry-pick, or revert; when Git is already in the middle of one of those operations; or for interruption recovery, conflict resolution, ours/theirs interpretation, and deciding when user guidance is required. Continue a detected active operation before considering new work, never choose the integration method, and never guess an unclear next action or resolution.
Guide a safe git rebase of the current branch onto a target branch, including conflict triage and resolution steps. Use when asked to rebase, update a branch, or resolve rebase conflicts.