merge-strategy
Intelligent merge/rebase strategy selection with safe execution
Works with
--- name: merge-strategy description: Intelligent merge/rebase strategy selection with safe execution license: MIT --- # Intelligent Merge Strategy Selector I'll help you choose the optimal Git merge strategy and execute it safely based on branch analysis, history, and team conventions. Arguments: `$ARGUMENTS` - branch name, strategy preference (merge/rebase/squash), or 'auto' ## Token Optimization **Expected range**: 1,500–2,500 tokens (initial), 100 tokens (fast-forward) **Caching**: No persistent caching — analyzes current git state on each run. **Early exit**: Returns immediately if the merge is a clean fast-forward. **Patterns used**: Grep-before-Read, early exit, Bash for system queries
More Git Workflows skills
git-commit
github/awesome-copilot
Execute git commit with conventional commit message analysis, intelligent staging, and message generation. Use when user asks to commit changes, create a git commit, or mentions "/commit". Supports: (1) Auto-detecting type and scope from changes, (2) Generating conventional commit messages from diff, (3) Interactive commit with optional type/scope/description overrides, (4) Intelligent file staging for logical grouping
git-workflow-and-versioning
addyosmani/agent-skills
Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.
resolve-merge-conflicts
warpdotdev/common-skills
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.
