Git Resolve Conflicts

Resolves merge or rebase conflicts by what each side intended, never by picking a hunk, then re-runs the full gates.

ainova-systems Updated 2 repo stars

File contents

ainova-systems/intelligence-dev-packs commit 69b1ab99e3

Frequently asked questions

npx get-skill add ainova-systems/git-resolve-conflicts