Resolving Merge Conflicts

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

akillness Updated 57 repo stars
Illustration of a modular skill library: a teal router selects a few skill cards and sends them to separate agent hosts

File contents

akillness/oh-my-skills commit d16d6692fc

Frequently asked questions

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