reconcile-merge-conflicts
CommunityResolve Git conflicts with confidence.
Authorcameroncooke
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill helps you safely and effectively resolve merge and rebase conflicts in Git, preventing regressions and preserving the intent of both branches.
Core Features & Use Cases
- Conflict Detection: Automatically identifies if a merge or rebase conflict is in progress.
- Branch-Aware Reconciliation: Intelligently merges changes by treating the target branch (e.g.,
main) as canonical. - Audit Reporting: Generates a detailed report of decisions made, risks, and open questions.
- Use Case: When you encounter merge conflicts after rebasing your feature branch onto
main, this Skill will guide you through resolving each conflict, ensuring no regressions are introduced and documenting the process.
Quick Start
Use the reconcile-merge-conflicts skill to resolve the current Git merge conflicts.
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: reconcile-merge-conflicts Download link: https://github.com/cameroncooke/skills/archive/main.zip#reconcile-merge-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 223,000+ vetted skills library on demand.