skills.rest
cameroncooke
cameroncookeCOMMUNITY
Explore all skills by this author →
Website𝕏@camsoft2000GitHub

reconcile-merge-conflicts

Resolve Git merge and rebase conflicts with a confidence-ranked audit report.

44|1|Updated Jan 21, 2026
Search Tags:#git#developer tools#version control#merge conflicts#rebase#code reconciliation
One-click install
npx skills add https://github.com/cameroncooke/skills --skill reconcile-merge-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: reconcile-merge-conflicts
Source: https://github.com/cameroncooke/skills/tree/main/reconcile-merge-conflicts
Command: npx skills add https://github.com/cameroncooke/skills --skill reconcile-merge-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps you safely and effectively resolve merge and rebase conflicts in Git, preventing regressions and preserving the intent of both branches.

Core Features & Use Cases

  • Conflict Detection: Automatically identifies if a merge or rebase conflict is in progress.
  • Branch-Aware Reconciliation: Intelligently merges changes by treating the target branch (e.g., main) as canonical.
  • Audit Reporting: Generates a detailed report of decisions made, risks, and open questions.
  • Use Case: When you encounter merge conflicts after rebasing your feature branch onto main, this Skill will guide you through resolving each conflict, ensuring no regressions are introduced and documenting the process.

Quick Start

Use the reconcile-merge-conflicts skill to resolve the current Git merge conflicts.

Frequently Asked Questions about reconcile-merge-conflicts

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

FAQPage Schema
How do I resolve Git merge conflicts without introducing regressions?▼

Resolving Git merge conflicts safely requires analyzing branch history and code intent, treating the target branch as canonical while preserving source branch intent to prevent regressions. It generates a confidence-ranked audit report detailing decisions and risks.

What is the best way to handle Git rebase conflicts on a feature branch?▼

Handling Git rebase conflicts is best done through branch-aware reconciliation, intelligently merging changes by treating the target branch as canonical while preserving source branch intent. This ensures safe conflict resolution and branch reconciliation.

Does this conflict resolution approach work for both merge and rebase operations?▼

Yes, this conflict resolution approach applies to both Git merge and rebase operations by automatically detecting active conflicts. It intelligently merges changes while treating the target branch as canonical and preserving source branch intent.

How do I document Git conflict resolution decisions for later review?▼

You can document Git conflict resolution decisions using the automatically generated audit report. It details decisions made during branch reconciliation, highlights potential risks, and lists open questions for later review.

When should I not use automated reconciliation for Git branch conflicts?▼

You should not use automated reconciliation for Git branch conflicts when the confidence-ranked audit report highlights low confidence or unresolved open questions. These scenarios require manual code review to ensure no regressions are introduced.

Related Skills

Explore More Software Engineering Skills→
JHostalekJHostalek
10

rebase

Rebase a Git branch onto a target branch and resolve conflicts.

Community
Advanced
cedricfarinazzocedricfarinazzo

merge-update-pr

Rebase a PR branch on main and push only when a merge commit is created.

Community
Advanced
jmolzjmolz

source-command-review

Automate code review and regression suite execution for software development workflows.

Community
Advanced
chiptoe-svgchiptoe-svg

update-skills

Detect and merge upstream updates for git branch-distributed skills.

Community
Intermediate