Agent skill · shipshitdev
fix-merge-conflicts
Resolve git merge conflicts correctness-first, then prove the tree still builds. Use when a merge, rebase, cherry-pick, or stash pop leaves conflict marker
Reference it in any coding agent with:
@skills shipshitdev/fix-merge-conflicts