pelizzai-resolving-merge-conflicts

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.

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.

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.

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.

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.

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.