Merge Conflicts

Use when the user has merge conflicts or says "resolve conflicts". Understands conflict markers, resolution strategies, and verification workflow.

event4u-app Updated 19 repo stars
event4u Agent Config

File contents

event4u-app/agent-config commit e7aa5c7ff9

Frequently asked questions

npx get-skill add event4u-app/merge-conflicts