Resolving Merge Conflicts

Use when a git merge or rebase reports conflicts and the operation is in progress.

gabrielmoreira Updated 20 repo stars

File contents

gabrielmoreira/agent-skills-mirror commit 18e42da33e

Frequently asked questions

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