[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M72SWVCZ4NAX9PC1819WRCS1":3,"skill-same:01M72SWVCZ4NAX9PC1819WRCS1":45},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":16,"categories":17,"keywords":18,"publishedAt":19,"linkOnly":20,"markdownContent":21,"markdownBody":22,"frontMatter":23,"refName":24,"commitSha":25,"skillDirectory":26,"forksCount":27,"repositoryHtmlUrl":28,"repositoryHomepageUrl":6,"ownerHtmlUrl":29,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":30,"install":31,"resources":44},"01M72SWVCZ4NAX9PC1819WRCS1","matt-pocock-resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","NickSuomi\u002Fmorpheus","NickSuomi","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F79413822?v=4","01M72STZM7GHTS3H3CTJ2N217T","nicksuomi","01M72STZN7EW8D5FH93RPKFTVH",1,"Apache-2.0","https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-resolving-merge-conflicts\u002FSKILL.md",[],[],"2026-11-10 22:39:42",false,"---\nname: matt-pocock-resolving-merge-conflicts\ndescription: \"Use when you need to resolve an in-progress git merge\u002Frebase conflict.\"\n---\n\n1. **See the current state** of the merge\u002Frebase. Check git history, and the conflicting files.\n\n2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues\u002Ftickets.\n\n3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.\n\n4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.\n\n5. **Finish the merge\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\n","1. **See the current state** of the merge\u002Frebase. Check git history, and the conflicting files.\n\n2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues\u002Ftickets.\n\n3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.\n\n4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.\n\n5. **Finish the merge\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\n",{"name":5,"description":7},"main","0e23c08904ca612c8e13c47b92e931aee35ba17d","packages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-resolving-merge-conflicts",0,"https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus","https:\u002F\u002Fgithub.com\u002FNickSuomi","2026-09-30 11:36:16",{"source":8,"skillName":5,"commands":32,"prompt":42,"zipAvailable":43},[33,36,39],{"tool":34,"command":35},"npx","npx skills add NickSuomi\u002Fmorpheus --skill matt-pocock-resolving-merge-conflicts",{"tool":37,"command":38},"bunx","bunx skills add NickSuomi\u002Fmorpheus --skill matt-pocock-resolving-merge-conflicts",{"tool":40,"command":41},"pnpm","pnpm dlx skills add NickSuomi\u002Fmorpheus --skill matt-pocock-resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-resolving-merge-conflicts\u002FSKILL.md",true,[],[46,53,60,67,74,81],{"skillNo":47,"name":48,"nameZh":6,"description":49,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":50,"categories":51,"keywords":52,"publishedAt":19},"01M72SY50253N686JJJZAE7YGJ","matt-pocock-writing-shape","Writing, exploit — shape raw material into an article, paragraph by paragraph.","https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-writing-shape\u002FSKILL.md",[],[],{"skillNo":54,"name":55,"nameZh":6,"description":56,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":57,"categories":58,"keywords":59,"publishedAt":19},"01M72SY1YHA30ZTJQRS9Y3QA1K","matt-pocock-writing-great-skills","Reference for writing and editing skills well — the vocabulary and principles that make a skill predictable.","https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-writing-great-skills\u002FSKILL.md",[],[],{"skillNo":61,"name":62,"nameZh":6,"description":63,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":64,"categories":65,"keywords":66,"publishedAt":19},"01M72SXZBA993FT9XKANG0T3RG","matt-pocock-writing-fragments","Writing, explore — mine raw fragments, no structure yet.","https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-writing-fragments\u002FSKILL.md",[],[],{"skillNo":68,"name":69,"nameZh":6,"description":70,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":71,"categories":72,"keywords":73,"publishedAt":19},"01M72SXXC8J36HRMW3MD4F3ZT9","matt-pocock-writing-beats","Writing, exploit — assemble raw material into a journey of beats, grounding each term before a beat leans on it.","https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-writing-beats\u002FSKILL.md",[],[],{"skillNo":75,"name":76,"nameZh":6,"description":77,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":19},"01M72SXTHD3B6HMK8CECZ1Z0T8","matt-pocock-wizard","Generate an interactive bash wizard that walks a human through a manual procedure — third-party setup, a one-off migration, an A→B state transition — opening URLs, capturing values, confirming each step, and writing .env files and GitHub Actions secrets.","https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-wizard\u002FSKILL.md",[],[],{"skillNo":82,"name":83,"nameZh":6,"description":84,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":85,"categories":86,"keywords":87,"publishedAt":19},"01M72SXQ1VR21MR9K7A7Y5BRHG","matt-pocock-wayfinder","Plan a huge chunk of work — more than one agent session can hold — as a shared map of investigation tickets on your issue tracker, and resolve them one at a time until the way to the destination is clear.","https:\u002F\u002Fgithub.com\u002FNickSuomi\u002Fmorpheus\u002Fblob\u002Fmain\u002Fpackages\u002Fruntime\u002Fbundled-skills\u002Fmatt-pocock-wayfinder\u002FSKILL.md",[],[]]