skills.rest
JoNaYeon
JoNaYeonCOMMUNITY
Explore all skills by this author →
GitHub

work_git_conflict-resolver

Analyze Git conflict markers and propose resolution plans for merge and rebase conflicts.

1|Updated Apr 16, 2026
Search Tags:#git#workflow#code-analysis#conflict-resolution#branch-management#merge-conflicts#rebases
One-click install
npx skills add https://github.com/JoNaYeon/claude-code-skills --skill work-git-conflict-resolver
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: work_git_conflict-resolver
Source: https://github.com/JoNaYeon/claude-code-skills/tree/main/work/git/work_git_conflict-resolver
Command: npx skills add https://github.com/JoNaYeon/claude-code-skills --skill work-git-conflict-resolver

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Conflict resolution for Git merges and rebases, guiding users to resolve conflicts efficiently and correctly.

Core Features & Use Cases

  • Analyzes unmerged files and conflict markers to identify conflict blocks.
  • Proposes structured resolution strategies and justification for each block.
  • Provides a guided, reproducible workflow to complete merge or rebase operations.

Quick Start

Run the conflict resolver when you encounter a merge or rebase conflict to analyze conflict blocks and receive a recommended resolution plan, then apply the suggested changes and continue the operation.

Frequently Asked Questions about work_git_conflict-resolver

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

FAQPage Schema
How do I resolve git merge conflicts in unmerged files?▼

To resolve git merge conflicts, this Skill analyzes unmerged files and conflict markers to propose structured resolution strategies with justification, providing a reproducible workflow to complete the merge operation.

What is the best way to handle git rebase conflicts on work-in-progress commits?▼

Handling git rebase conflicts involves analyzing conflict blocks to propose correct resolutions. This Skill identifies unmerged files, reads conflict markers, and outputs a guided resolution plan with steps for user confirmation during rebases.

How does conflict block analysis work for feature branch merges?▼

Conflict block analysis for feature branch merges works by reading conflict markers in unmerged files, identifying the divergent code sections, and proposing a structured resolution strategy with justification for each block.

Can I use this conflict resolver for both merging feature branches and rebasing commits?▼

Yes, you can use this conflict resolver for both merging feature branches and rebasing work-in-progress commits. It analyzes conflict markers and outputs a guided resolution plan applicable to active development scenarios.

Does this git workflow tool require manual steps to complete a merge after proposing a resolution?▼

Yes, this git workflow tool requires manual confirmation. It outputs a guided resolution plan with justification and steps, meaning you must apply the suggested changes and continue the operation yourself.

Why does this conflict resolution approach provide justification for each conflict block?▼

This conflict resolution approach provides justification for each block to ensure merges and rebases are efficient and correct. Offering reasoning behind proposed strategies helps users confidently apply changes and complete operations reproducibly.

Related Skills

Explore More Software Engineering Skills→
ProyectoG007ProyectoG007

Git

Manage Git commits, branches, rebases, merges, and conflict resolution.

Community
Advanced
mixomatmixomat

clean-gone-branches

Delete local git branches marked [gone] while skipping worktree branches.

Community
Intermediate
ZateZate
9

git-workflows

Define Git workflows for branching, commits, reviews, and release management.

Community
Basic
flowelflowel

resolving-merge-conflicts

Analyze Git merge and rebase conflicts and automate resolution steps.

Community
Intermediate