Resolving Merge Conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

practicalswan Updated 24 repo stars

File contents

practicalswan/agent-skills commit f30dae8168

Frequently asked questions

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