Resolving Merge Conflicts

Use when resolving an in-progress git merge or rebase conflict.

ForgeyClap Updated 2 repo stars

File contents

forgeyclap/claude-forge commit d47d98b4a0

Frequently asked questions

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