skills.rest
buvis
buvisOFFICIAL
Explore all skills by this author →
WebsiteGitHub

resolve-git-conflicts

Diagnose git conflict types and guide per-file resolution with abort options.

2|Updated Dec 20, 2020
Search Tags:#git#safety#merge#rebase#cherry-pick#conflict-resolution#conflicts
One-click install
npx skills add https://github.com/buvis/home --skill resolve-git-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-git-conflicts
Source: https://github.com/buvis/home/tree/main/.claude/skills/resolve-git-conflicts
Command: npx skills add https://github.com/buvis/home --skill resolve-git-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill guides developers through safe git conflict resolution, reducing guesswork and mistakes when dealing with unmerged paths, rebase, cherry-pick, or stash conflicts.

Core Features & Use Cases

  • Guided diagnosis: Determine operation type from git status and conflict markers to identify whether it's a merge, rebase, cherry-pick, or stash conflict.
  • Ours vs theirs explanations: Explain what each side changed and why it matters, with references to terminology.md.
  • Per-file resolution workflow: Step-by-step prompts for resolving each conflict file, including how to stage and continue operations.
  • Abort and safety guidance: Provides safe abort commands and warnings about data loss.

Quick Start

Initiate the guided conflict-resolution flow on your repository and begin resolving the first conflicted file.

Frequently Asked Questions about resolve-git-conflicts

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

FAQPage Schema
How do I resolve git merge conflicts safely without losing changes?▼

Resolve git merge conflicts safely by diagnosing the operation type from git status, reviewing ours vs theirs diffs, and choosing to keep ours, keep theirs, merge, or skip before staging and continuing.

What is the difference between ours and theirs when resolving rebase conflicts?▼

During rebase conflict resolution, ours refers to the target branch being rebased onto, while theirs refers to your original commits being replayed. Reviewing diffs before applying resolutions prevents unintended data loss.

How do I abort a git cherry-pick or merge if conflicts are too complex?▼

Abort a conflicted git cherry-pick or merge safely by using guided abort commands such as git cherry-pick --abort or git merge --abort, which cancel the operation and restore the repository to its pre-conflict state.

Can I resolve stash conflicts step by step for each conflicted file?▼

Yes, stash conflicts can be resolved per-file through a step-by-step workflow that identifies conflicted paths, explains changes, offers resolution choices, and stages files before continuing the git operation.

What's the best way to document chosen git conflict resolutions?▼

The best way to document git conflict resolutions is to follow a guided workflow that records the chosen resolution strategy, explains why ours or theirs was kept, and stages files with clear resolution context.

Related Skills

Explore More Software Engineering Skills→
terzigoluterzigolu
37

resolve-merge-conflicts

Summarize Git merge conflicts with unresolved paths, hunks, and compact diffs.

Community
Advanced
MilesChouMilesChou
1

Resolving-Conflict

Resolve Git conflicts during rebase or merge operations.

Community
Basic
shonenmshonenm
2

conflict-resolve

Resolve Git merge and rebase conflicts by analyzing base, ours, and theirs states.

Community
Advanced
JoNaYeonJoNaYeon
1

work_git_conflict-resolver

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

Community
Intermediate