Resolve Merge Conflicts

Syncs the current branch with its merge base (stack parent or main), resolves or surfaces conflicts, then runs doctor and pushes.

jasonharmongit Updated

File contents

jasonharmongit/skills commit 13d6d0e8d4

Frequently asked questions

npx get-skill add jasonharmongit/resolve-merge-conflicts