Resolve Git Conflicts

Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.

penpot Updated 62.4k repo stars
Picture from the README

File contents

penpot/penpot commit 7fcfd53283

Frequently asked questions

npx get-skill add penpot/resolve-git-conflicts