git-github-conflict-resolve
CommunityResolve Git conflicts like a pro.
AuthorFutureAtoms
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill helps developers efficiently identify, understand, and resolve Git merge conflicts, preventing project delays and code integration issues.
Core Features & Use Cases
- Conflict Identification: Quickly locate all files with merge conflicts.
- Resolution Strategies: Provides clear guidance on keeping your changes, their changes, manual editing, or combining both.
- Merge Tool Integration: Supports configuring and using external merge tools for complex conflicts.
- Use Case: When merging a feature branch into main, you encounter conflicts. This Skill guides you through analyzing the conflict markers, choosing a resolution strategy, and completing the merge commit.
Quick Start
Use the git-github-conflict-resolve skill to help resolve the current merge conflicts in the repository.
Dependency Matrix
Required Modules
None requiredComponents
Standard package💻 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: git-github-conflict-resolve Download link: https://github.com/FutureAtoms/claude-skills-backup/archive/main.zip#git-github-conflict-resolve 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 223,000+ vetted skills library on demand.