Merge Conflict Resolution

Resolve git merge/rebase conflicts systematically without losing either side's intent. Use when the user says fix this merge conflict, resolve the rebase, there are conflicts, git is stuck on a conflict, or after pulling/ rebasing/merging when markers appear. Covers reading both sides' intent, semantic (not just textual) resolution, and verification before continuing.

hongyime Updated

File contents

hongyime/theprawnskills commit 50fe98bbcd

Frequently asked questions

npx get-skill add hongyime/merge-conflict-resolution