git-merge-conflict-resolution

Resolve Git merge and rebase conflicts with per-hunk intent logs.

7|Updated Feb 14, 2026

Search Tags:#git #logging #verification #conflict-resolution #version-control #merge-conflict #intent-preservation

Ready to run

npx skills add https://github.com/KentoShimizu/sw-agent-skills --skill git-merge-conflict-resolution

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-merge-conflict-resolution
Source: https://github.com/KentoShimizu/sw-agent-skills/tree/main/skills/git-merge-conflict-resolution
Command: npx skills add https://github.com/KentoShimizu/sw-agent-skills --skill git-merge-conflict-resolution

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes assets (resource) and references (resource) components.

What problem does it solve?

Resolve Git merge/rebase conflicts without silently dropping behavior from either side.

Core Features & Use Cases

Classify conflicts by behavioral impact and risk.
Log rationale using a standard conflict-resolution log template.
Verify outcomes with a verification checklist and domain-owner escalation for semantic ambiguities.

Quick Start

Resolve a Git merge conflict by mapping per-hunk intent and recording decisions before completing the merge.

Frequently Asked Questions about git-merge-conflict-resolution

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I resolve git merge conflicts without losing code behavior?▼

Resolve git merge conflicts by classifying per-hunk behavioral impact, capturing explicit intent, and logging decisions to prevent silently dropping behavior from either branch side.

What is intent preservation during a git rebase conflict?▼

Intent preservation during a git rebase conflict is the process of explicitly capturing per-hunk rationale to ensure verifiable outcomes and prevent silent behavioral changes across multi-branch integrations.

How do I log rationale for per-hunk git merge decisions?▼

Log rationale for per-hunk git merge decisions by applying a standard conflict-resolution log template that records your choices and classifies conflicts by behavioral risk before completing the merge.

Can I use a verification checklist for ambiguous multi-branch integration conflicts?▼

Use a conflict verification checklist for ambiguous multi-branch integration conflicts to verify outcomes and trigger domain-owner escalation when per-hunk semantic intent remains unclear.

When should I escalate semantic ambiguities during a version-control merge?▼

Escalate semantic ambiguities during a version-control merge when per-hunk intent cannot be definitively resolved, using the conflict verification checklist to trigger domain-owner review.