Provides consistent git branch management, rebasing, and merge conflict resolution procedures for coding agents.
Install
mkdir -p .claude/skills/git-ops-llipe && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/15067" && unzip -o skill.zip -d .claude/skills/git-ops-llipe && rm skill.zipInstalls to .claude/skills/git-ops-llipe
Activation
This is the description your AI agent reads to decide when to run this skill — the better it matches your request, the more reliably it fires.
Reusable procedures for git branch management, merge, rebase, and conflict resolution. This skill describes *procedures* — merge authority policies remain in `github-ops.agent.md`. Any agent can invoke this skill when encountering git operations.Key capabilities
- →Create feature or story branches
- →Rebase a branch onto a target
- →Merge PRs or branches
- →Resolve merge conflicts
- →Recover from failed git operations
- →Perform pre-merge checks
How it works
The skill provides step-by-step procedures for common git operations like branch creation, rebasing, merging, and conflict resolution, including recovery strategies for failed operations.
Inputs & outputs
When to use git-ops
- →Create feature branches from the default branch
- →Update a working branch by rebasing onto a target branch
- →Resolve git merge conflicts systematically
- →Synchronize integration branches with remote state
About git-ops
This skill provides a standardized set of procedures for common git operations, including branch creation, rebasing onto target branches, and conflict resolution. It ensures agents follow consistent workflows for maintaining repository health during feature development and integration.
Reusable procedures for git branch management, merge, rebase, and conflict resolution. This skill describes *procedures* — merge authority policies remain in `github-ops.agent.md`. Any agent can invoke this skill when encountering git operations.
When not to use it
- →When merge authority policies are needed (use github-ops.agent.md)
- →When force pushing shared branches
Limitations
- →Merge authority policies remain in `github-ops.agent.md`.
- →Force pushing must only be used on branches owned exclusively by the current agent/developer.
- →Schema/migration and business logic conflicts require user intervention.
How it compares
This skill offers standardized procedures and heuristics for git operations, including conflict resolution and recovery, which provides a consistent and guided approach compared to manual git command execution.
Compared to similar skills
git-ops side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| git-ops (this skill) | 0 | 4mo | Review | Intermediate |
| resolve-conflicts | 81 | 8mo | Review | Intermediate |
| openspec-onboard | 10 | 6mo | Review | Beginner |
| codex-cli-bridge | 9 | 9mo | Review | Intermediate |
Try saying
Example prompts that trigger this skill in your AI assistant.
You might also like
resolve-conflicts
antinomyhq
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
openspec-onboard
studyzy
Guided onboarding for OpenSpec - walk through a complete workflow cycle with narration and real codebase work.
codex-cli-bridge
alirezarezvani
Bridge between Claude Code and OpenAI Codex CLI - generates AGENTS.md from CLAUDE.md, provides Codex CLI execution helpers, and enables seamless interoperability between both tools
skill-sync
KyleKing
Syncs Claude Skills with other AI coding tools like Cursor, Copilot, and Codeium by creating cross-references and shared knowledge bases. Invoke when user wants to leverage skills across multiple tools or create unified AI context.
github-workflow-automation
ruvnet
Advanced GitHub Actions workflow automation with AI swarm coordination, intelligent CI/CD pipelines, and comprehensive repository management
git-advanced-workflows
wshobson
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.