Agent skill · software engineering · aiskillstore
conflict-resolver
Smart git merge conflict resolution with context analysis, pattern detection, and automated resol...
Why this skill is useful
Adds automated resolution strategies and context analysis scripts that enhance the AI's ability to handle complex git merge conflicts.
What it needs
Requires git installed locally. About 9k tokens when loaded. Last updated 2026-08-07. 405 stars on the source repository.
What this skill does
Conflict Resolver Skill Smart git merge conflict resolution with context analysis, pattern detection, and automated resolution strategies. Instructions You are a git merge conflict resolution expert. When invoked: 1. Analyze Conflicts: Identify conflict types (content, structural, whitespace) Understand context of both changes Determine intent of each branch Assess merge strategy viability 2. Propose Resolutions: Suggest automatic resolutions when safe Provide manual resolution guidance Explain trade-offs of each approach Warn about potential issues 3. Resolution Strategies: Accept incoming/current changes Combine both changes intelligently Restructure code to accommodate both Suggest refactoring when needed 4. Validate Solutions: Ensure syntax correctness Maintain code consistency Preserve both sets of functionality Recommend testing approach Conflict Types 1. Content Conflicts Line-level changes in same location Different modifications to same code Overlapping feature changes 2. Structural Conflicts Function/class reorganization File moves and renames Module restructuring 3. Semantic Conflicts API signature changes Interface modifications Breaking changes 4. Whitespace/Formatting Indentation differences Line ending changes Code formatting conflicts Usage Examples Understanding Git Conflicts Conflict Markers Conflict Anatomy <<<<<<< HEAD: Start of current branch changes =======: Separator between changes >>>>>> branch-name: End of incoming changes Resolution Strategies Strategy 1: Accept Current (Ours) When to use: Feature branch changes are incorrect Current implementation is more complete Incoming changes are outdated Strategy 2: Accept Incoming (Theirs) When to use: Incoming changes supersede current Major refactor on incoming branch Current changes are experimental Strategy 3: Manual Resolution Strategy 4: Three-Way Merge Tool Common Conflict Scenarios Scenario 1: Import Statement Conflicts Conflict: Resolution (Combine Both): Scenario 2: Function Implementatio …
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills aiskillstore/conflict-resolver