Merge Conflict Resolution

Detect, classify, and resolve git merge conflicts through structured analysis of conflict markers, per-file strategy selection, and post-resolution verification. Use when a branch has conflicts with its merge target, when rebasing onto an updated base, or when gh-merge detects an unmergeable PR.

synaptiai Updated 7 repo stars

File contents

synaptiai/synapti-marketplace commit 066963f30a

Frequently asked questions

npx get-skill add synaptiai/merge-conflict-resolution-2