skills.rest
tonomb
tonombCOMMUNITY
Explore all skills by this author →
Website𝕏@tono_mtzbGitHub

resolving-merge-conflicts

Resolve git merge and rebase conflicts by analyzing commit history and reconciling code changes.

Updated Apr 8, 2026
Search Tags:#git#debugging#version control#merge#rebase#code resolution
One-click install
npx skills add https://github.com/tonomb/personal-pnl --skill resolving-merge-conflicts-tonomb
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolving-merge-conflicts
Source: https://github.com/tonomb/personal-pnl/tree/main/.agents/skills/resolving-merge-conflicts
Command: npx skills add https://github.com/tonomb/personal-pnl --skill resolving-merge-conflicts-tonomb

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill addresses the friction and potential for error when reconciling divergent code changes during git merge or rebase operations.

Core Features & Use Cases

  • Conflict Analysis: Provides a structured framework to identify the root cause of merge conflicts by reviewing commit history and original intent.
  • Resolution Strategy: Guides the user through preserving logical integrity while resolving incompatible code hunks.
  • Verification: Ensures that resolved code remains functional by mandating the execution of automated tests and linters.

Quick Start

Use the resolving-merge-conflicts skill to guide the resolution of the current git merge conflict in this repository.

Frequently Asked Questions about resolving-merge-conflicts

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

FAQPage Schema
How do I resolve git merge conflicts when branches have overlapping code changes?▼

To resolve git merge conflicts, analyze the commit history to understand divergent code changes, reconcile the incompatible hunks while preserving logical integrity, and run automated tests to validate the final resolution.

What's the best way to identify the root cause of a git rebase conflict?▼

Identifying the root cause of a git rebase conflict requires reviewing the project's commit history to trace the original intent behind the divergent code changes before reconciling the overlapping modifications.

What should I do after fixing incompatible code hunks during a git merge?▼

After fixing incompatible code hunks during a git merge, you should execute project-specific automated test suites and linters to verify that the resolved code remains functional and maintains its integrity.

Do I need git CLI access to fix version control merge conflicts systematically?▼

Yes, systematically resolving version control merge conflicts requires git CLI access to analyze commit history, along with project-specific test suites to validate the integrity of the final code resolution.

Why does resolving divergent code changes require reviewing commit history?▼

Resolving divergent code changes requires reviewing commit history because it provides a structured framework to identify the root cause of the merge conflict and understand the original intent of the overlapping modifications.

Related Skills

Explore More Software Engineering Skills→
xlelibertyxleliberty

using-git-worktrees

Automates Git worktree creation and verification for parallel branch development.

Community
Advanced
HomericIntelligenceHomericIntelligence
18

run-tests

Execute Mojo or Python test suites and generate validation reports.

Official
Basic
antonyfmunozantonyfmunoz

git

Manage Git version control tasks for EOS code with commit, branch, merge, and push workflows.

Community
Intermediate
druejaramillodruejaramillo

merge-conflict-resolution

Resolve Git merge, rebase, and cherry-pick conflicts by tracing change intent.

Community
Advanced