Resolve Merge Conflicts

Resolves a named Git conflict when explicitly asked to reconcile a merge, rebase, or cherry-pick; preserves both intents and keeps continuation, commit, and push authority separate.

JovaniPink Updated 1 repo stars

File contents

jovanipink/skills commit 2c4d113f83

Frequently asked questions

npx get-skill add jovanipink/resolve-merge-conflicts