skills.rest
dtsong
dtsongCOMMUNITY
Explore all skills by this author →
GitHub

Git Conflicts

Analyze Git conflict markers and guide resolution with checkout commands.

1|1|Updated Feb 21, 2026
Search Tags:#git#developer tools#version control#merge#rebase#conflicts
One-click install
npx skills add https://github.com/dtsong/claude-code-windows-setup --skill git-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: Git Conflicts
Source: https://github.com/dtsong/claude-code-windows-setup/tree/main/skills/git-workflows/skills/conflicts
Command: npx skills add https://github.com/dtsong/claude-code-windows-setup --skill git-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill provides guided assistance for resolving merge, rebase, and cherry-pick conflicts in Git, making a complex and often frustrating process more manageable.

Core Features & Use Cases

  • Conflict Detection: Automatically identifies the type of Git operation in progress (merge, rebase, cherry-pick) and lists all conflicting files.
  • Conflict Analysis: For each conflicting file, it analyzes the changes from both branches, explains the differences, and suggests resolution strategies.
  • Guided Resolution: Offers step-by-step instructions and commands for resolving conflicts, including strategies like accepting ours, accepting theirs, or manual merging.
  • Use Case: When a git merge command results in conflicts, you can invoke this Skill to get a clear breakdown of what changed in each file and how to best combine the divergent code.

Quick Start

Run /git-conflicts to get help resolving your current merge conflicts.

Frequently Asked Questions about Git Conflicts

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

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

To resolve git merge conflicts, the Skill identifies the conflict type, lists conflicting files, details changes from both branches, and provides step-by-step strategies like manual merging or using git commands to finalize the merge.

What is the best way to handle divergent code during a git rebase?▼

Handling divergent code during a git rebase involves analyzing conflict markers to understand differences and applying suggested resolution strategies, such as accepting ours or theirs, to successfully complete the rebase.

How do I use git checkout to accept ours or theirs for cherry-pick conflicts?▼

For cherry-pick conflicts, you can use guided Git commands like checkout --ours or checkout --theirs to accept specific changes, followed by git add to stage the resolved files and continue the cherry-pick process.

Can I get an analysis of changes from HEAD and remote branches before manual merging?▼

Yes, the Skill analyzes conflict markers to provide a clear breakdown of changes from HEAD and remote branches, explaining the differences in each conflicting file to inform your manual merging decisions.

Does this tool provide step-by-step assistance for complex version control conflicts?▼

Yes, the tool offers step-by-step assistance by automatically detecting the ongoing Git operation, listing all affected files, and suggesting actionable steps to resolve complex version control conflicts with confidence.

Related Skills

Explore More Software Engineering Skills→
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced
FabienDehopreFabienDehopre

resolving-merge-conflicts

Resolve in-progress Git merge and rebase conflicts by analyzing changes and completing integration.

Community
Intermediate
jk278jk278

git-analyzer

Analyze git repositories to summarize commit history and file changes.

Community
Intermediate
sipherxyzsipherxyz
1

merge-main

Merge the main branch into a feature branch with stashing and conflict resolution.

Official
Advanced