github-conflicts

Name: github-conflicts
Availability: InStock
Author: BreakerOfStems

Resolve Git merge and rebase conflicts with guided analysis and confirmation.

Updated Aug 23, 2026

Search Tags:#git #developer tools #version control #merge #rebase #conflicts

Ready to run

npx skills add https://github.com/BreakerOfStems/claude-skills --skill github-conflicts

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: github-conflicts
Source: https://github.com/BreakerOfStems/claude-skills/tree/main/skills/github-conflicts
Command: npx skills add https://github.com/BreakerOfStems/claude-skills --skill github-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill provides a structured and safe protocol for resolving Git merge and rebase conflicts, preventing accidental data loss or incorrect resolutions.

Core Features & Use Cases

Conflict Identification: Lists all files with active conflicts.
Conflict Analysis: Displays the differing versions of conflicting code sections.
Guided Resolution: Offers clear options for resolving conflicts (ours, theirs, manual).
Workflow Support: Provides specific steps for both merge and rebase conflict resolution.
Abort Functionality: Allows for safe cancellation of merge or rebase operations.
Use Case: When merging a feature branch into main, if conflicts arise, this skill guides you through analyzing each conflict and applying the correct resolution without guessing.

Quick Start

Use the github-conflicts skill to help resolve the current merge conflicts by analyzing the differences and guiding the resolution process.

Frequently Asked Questions about github-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 code?▼

To resolve Git merge conflicts safely, use a methodical protocol that identifies conflicting files, analyzes the differing code sections, and requires explicit confirmation before applying changes to prevent accidental data loss.

What is the difference between resolving merge and rebase conflicts in version control?▼

Resolving rebase conflicts involves applying commits sequentially, while merge conflicts combine branch histories. Both require analyzing conflicting code sections and selecting the correct resolution from the differing versions.

Can I abort a Git merge or rebase if the conflicts are too complex?▼

Yes, you can abort Git merge or rebase operations. Aborting provides a safe cancellation method that resets the repository state, preventing incorrect resolutions when conflicts become too complex to handle.

How do I identify which files have active Git conflicts after a branch merge?▼

You can identify files with active Git conflicts by listing all affected files in the repository. This conflict identification step shows exactly which files contain differing code sections needing resolution.

What are the options for resolving conflicting code sections during a Git merge?▼

The options for resolving conflicting code sections during a Git merge include keeping 'ours', keeping 'theirs', or performing a manual resolution. This guided approach ensures the correct version is applied.

When should I not attempt to resolve Git conflicts manually?▼

You should not resolve Git conflicts manually without a structured protocol, as guessing resolutions can lead to accidental data loss. Always analyze the differences and confirm changes before applying them.