resolve-git-conflicts
OfficialResolve git conflicts safely with guided choices.
Authorbuvis
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill guides developers through safe git conflict resolution, reducing guesswork and mistakes when dealing with unmerged paths, rebase, cherry-pick, or stash conflicts.
Core Features & Use Cases
- Guided diagnosis: Determine operation type from git status and conflict markers to identify whether it's a merge, rebase, cherry-pick, or stash conflict.
- Ours vs theirs explanations: Explain what each side changed and why it matters, with references to terminology.md.
- Per-file resolution workflow: Step-by-step prompts for resolving each conflict file, including how to stage and continue operations.
- Abort and safety guidance: Provides safe abort commands and warnings about data loss.
Quick Start
Initiate the guided conflict-resolution flow on your repository and begin resolving the first conflicted file.
Dependency Matrix
Required Modules
None requiredComponents
references
💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: resolve-git-conflicts Download link: https://github.com/buvis/home/archive/main.zip#resolve-git-conflicts Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.