resolving-merge-conflicts

Generic steps — the original listing is authoritative. Copy the command, run it where you keep agent skills, then confirm version and requirements in the original listing.

At a glance

• Published by mattpocock — listed by mcpso. Setup details live in the original listing.

Capabilities

Auto-detected from the listing text — confirm in the original listing.

How to use

1. Copy the Install command above.
2. Run it where you keep agent skills.
3. Confirm version and requirements in the original listing.

More in Agent workflows

• writing-fragments — Writing, explore — mine raw fragments, no structure yet.
• writing-beats — Writing, exploit — assemble raw material into a journey of beats, grounding each term before a beat leans on i
• convex-create-component — Builds reusable Convex components with isolated tables and app-facing APIs. Use for new components, reusable b
• lark-calendar — 飞书日历：管理日历日程和会议室。查看/搜索日程、创建/更新日程、管理参会人、查询忙闲和推荐时段、预定会议室。当用户需要查看日程安排、创建/修改会议、查询/预定会议室时使用。不负责：查询过去的视频会议记录（走 lark-v
• lark-okr — 飞书 OKR：管理目标与关键结果。查看和编辑 OKR 周期、目标、关键结果、对齐关系、量化指标和进展记录。当用户需要查看或创建 OKR、管理目标和关键结果、查看对齐关系时使用。不负责：待办任务管理（lark-task）、
• to-prd — Turn the current conversation into a PRD and publish it to the project issue tracker — no interview, just synt

More from mattpocock

• grill-me — Get grilled on any topic
• grilling — Socratic grilling for deeper understanding
• grill-with-docs — Grilling grounded in your docs
• ask-matt — Ask questions via question-driven learning loops

← Back to Skills catalog · View original listing ↗

Outdated or wrong? Report this listing.