Loading...
Loading...
Found 15 Skills
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.
Use when syncing a feature branch onto the latest origin base branch via git rebase.
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.
Use when you need to resolve an in-progress git merge/rebase conflict.
MUST USE for ANY git operations. Atomic commits, rebase/squash, history search (blame, bisect, log -S). STRONGLY RECOMMENDED: Use with delegate_task(category='quick', load_skills=['git-master'], ...) to save context. Triggers: 'commit', 'rebase', 'squash', 'who wrote', 'when was X added', 'find the commit that'.
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.
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
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.
Synchronize Remote Code
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.
Follow up on an existing PR by rebasing on the base branch, addressing reviewer comments, fixing CI issues, and pushing updates. Use when the user provides a PR URL or number and wants to get it ready for merge.
Branch finishing and PR preparation. Use when completing a feature branch, preparing a pull request, or cleaning up commit history.