skills.rest
troykelly
troykellyCOMMUNITY
Explore all skills by this author →
Website𝕏@troykellyGitHub

conflict-resolution

Resolve Git merge conflicts by analyzing versions and applying strategies.

10|Updated Jan 7, 2026
Search Tags:#git#collaboration#version control#merge conflict#rebase#code integrity
One-click install
npx skills add https://github.com/troykelly/codex-skills --skill conflict-resolution
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: conflict-resolution
Source: https://github.com/troykelly/codex-skills/tree/main/skills/conflict-resolution
Command: npx skills add https://github.com/troykelly/codex-skills --skill conflict-resolution

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill provides a systematic process for understanding, analyzing, and resolving merge conflicts in Git, ensuring code integrity and preventing data loss.

Core Features & Use Cases

  • Conflict Identification: Guides users on how to identify files with merge conflicts using git status.
  • Conflict Analysis: Provides a framework for understanding the intent behind conflicting changes and determining the best resolution strategy.
  • Resolution Strategies: Details methods for keeping 'theirs', keeping 'ours', or manually merging changes, including how to remove conflict markers.
  • Verification: Emphasizes running tests and performing visual reviews to ensure the resolution is correct.
  • Use Case: When git rebase or git merge results in conflicts, this skill helps you navigate the process to a clean and functional outcome.

Quick Start

Use the conflict-resolution skill to handle the merge conflicts detected in your current Git operation.

Frequently Asked Questions about conflict-resolution

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

FAQPage Schema
How do I resolve merge conflicts in Git after a failed rebase?▼

To resolve merge conflicts after a failed rebase, analyze the conflicting code versions to determine intent, apply strategies like keeping 'ours' or 'theirs', remove conflict markers, and verify code integrity by running tests before continuing the Git operation.

What is the best way to identify files with merge conflicts during version control?▼

The best way to identify files with merge conflicts is to run the git status command. This reveals which files have conflicting changes that require manual intervention before you can proceed with merging or rebasing.

How do I safely merge local changes when pulling from a remote repository?▼

To safely merge local changes when pulling, analyze the conflicting code versions to understand both intents, manually merge the necessary changes, remove conflict markers, and execute tests to ensure the final code integrity and functionality.

Does cherry-picking commits cause merge conflicts and how do I handle them?▼

Cherry-picking commits can cause merge conflicts when applied changes overlap with existing code. Handle them by analyzing the conflicting versions, choosing an appropriate resolution strategy, removing conflict markers, and running syntax checks to verify code integrity.

What are the limitations of manually resolving Git merge conflicts?▼

Manually resolving Git merge conflicts risks data loss and broken code if not verified. Limitations are mitigated by following a structured methodology that includes conflict analysis, careful application of resolution strategies, and mandatory test execution to ensure code integrity.

Related Skills

Explore More Software Engineering Skills→
MatthieuszMatthieusz

resolving-merge-conflicts

Resolve git merge and rebase conflicts with step-by-step guidance.

Community
Intermediate
ki2pixelki2pixel

testing-matrix-navigator

Plan and execute targeted pytest suites for code changes.

Community
Intermediate
GPTtangGPTtang
4

git-essentials

Provide essential Git commands for version control, branching, and collaboration.

Community
Intermediate
markus41markus41
1

gitworfkflows

Manage Git branching, commits, rebasing, and pull requests.

Community
Basic