pelizzai-resolving-merge-conflicts

Resolve git merge and rebase conflicts by synthesizing commit history and developer intent.

Updated Jun 26, 2026

Search Tags:#git #version control #code integration #merge #rebase #conflict resolution

Ready to run

npx skills add https://github.com/rpelizza/PelizzAI --skill pelizzai-resolving-merge-conflicts

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: pelizzai-resolving-merge-conflicts
Source: https://github.com/rpelizza/PelizzAI/tree/main/.agents/skills/pelizzai-resolving-merge-conflicts
Command: npx skills add https://github.com/rpelizza/PelizzAI --skill pelizzai-resolving-merge-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill resolves complex git merge and rebase conflicts by prioritizing the original intent of both code branches rather than blindly accepting changes or aborting the process.

Core Features & Use Cases

Intent-Based Resolution: Analyzes commit history and PR context to understand why changes were made before merging.
Safety Guardrails: Prevents autonomous aborts and forces escalation to the user when conflicts cannot be safely resolved.
Verification: Integrates with domain-specific tests to ensure the resolved code remains functional and compliant with project standards.

Quick Start

Trigger the conflict resolution process by asking the agent to resolve the current merge conflict in the repository.

Frequently Asked Questions about pelizzai-resolving-merge-conflicts

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

FAQPage Schema

How do I resolve git merge conflicts without losing the original intent of my feature branches?▼

To resolve git merge conflicts safely, this skill analyzes commit history and developer intent to reconcile incompatible code hunks while preserving the functional integrity of both branches. It synthesizes PR context to understand why changes were made before merging.

What is the best way to handle complex git rebase conflicts across feature branches?▼

Handling complex git rebase conflicts requires intent-aware logic that synthesizes commit history to reconcile incompatible code hunks. This skill operates within active git conflict states to preserve functional integrity rather than blindly accepting changes.

Can I automate git conflict resolution while ensuring code integration remains functional?▼

Yes, you can automate git conflict resolution with safety guardrails that prevent autonomous aborts and force escalation when conflicts cannot be safely resolved. It integrates with project-specific domain tests to validate that resolved code remains functional.

Do I need git CLI access and project-specific tests to resolve merge conflicts automatically?▼

Yes, resolving merge conflicts with intent-aware logic requires git CLI access to operate within active conflict states. It also needs contextual awareness of project-specific domain skills to validate resolutions through integrated testing.

Why does automatic merge conflict resolution sometimes abort or fail to preserve code logic?▼

Automatic merge conflict resolution fails when tools blindly accept changes without analyzing commit history or developer intent. This skill prevents unsafe autonomous aborts by escalating to the user when conflicts cannot be safely reconciled across feature branches.

What limitations exist when using intent-aware logic to resolve git conflicts?▼

The limitation of intent-aware conflict resolution is that it requires contextual awareness of project-specific domain skills to validate resolutions. Without integrated testing and git CLI access, it cannot guarantee that reconciled code hunks maintain functional integrity.