Branch Resolve Conflicts

Use when a git merge or rebase hits complex conflicts, or the user says "resolve conflicts" / "fix merge conflicts". Reconstructs intent, preserves both branches' goals when possible, and runs automated checks.

risadams Updated 2 repo stars

File contents

risadams/ink-and-agency commit 95b94f5837

Frequently asked questions

npx get-skill add risadams/branch-resolve-conflicts-2