Resolving Merge Conflicts

Use when resolving git merge/rebase conflicts. Resolve each hunk by finding primary sources (commit messages, PRs, issues) to understand original intent. Preserve both intents where possible; never invent new behavior and never --abort.

znlgis Updated 79 repo stars

File contents

znlgis/my-opencode-config commit 86135b01b8 Runs: znlgis/gh-cli

Frequently asked questions

npx get-skill add znlgis/resolving-merge-conflicts