Mk Resolving Merge Conflicts

Resolves an in-progress git merge/rebase conflict: reads conflict state, recovers each side's intent, resolves hunks, runs checks. NOT for the ship pipeline (mk:ship); NOT for bug debugging (mk:fix).

ngocsangyem Updated 16 repo stars

File contents

ngocsangyem/MeowKit commit eb13cf4025

Frequently asked questions

npx get-skill add ngocsangyem/mk-resolving-merge-conflicts-3