[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7AAMYDRHWG6F2J8FZXGZFP3":3,"skill-same:01M7AAMYDRHWG6F2J8FZXGZFP3":51},{"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":14,"repositoryHtmlUrl":27,"repositoryHomepageUrl":6,"ownerHtmlUrl":28,"ownerBlogUrl":6,"ownerDescription":29,"updatedAt":30,"install":31,"resources":44},"01M7AAMYDRHWG6F2J8FZXGZFP3","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","Poom5741\u002Fai-sdlc-course","Poom5741","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F33005516?v=4","01M7AAM0KBY6VF5RZCR1BG1M79","Poom","01M7AAM0MEH42AZTT55ZPYXMWC",0,"MIT","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fengineering\u002Fresolving-merge-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: 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","4944f4de3932df8e23b7769c1a289f45605421d1",".pi\u002Fskills\u002Fmattpocock\u002Fengineering\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course","https:\u002F\u002Fgithub.com\u002FPoom5741","uni student number 6609611790","2026-08-18 16:56:21",{"source":8,"skillName":5,"commands":32,"prompt":42,"zipAvailable":43},[33,36,39],{"tool":34,"command":35},"npx","npx skills add Poom5741\u002Fai-sdlc-course --skill resolving-merge-conflicts",{"tool":37,"command":38},"bunx","bunx skills add Poom5741\u002Fai-sdlc-course --skill resolving-merge-conflicts",{"tool":40,"command":41},"pnpm","pnpm dlx skills add Poom5741\u002Fai-sdlc-course --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fengineering\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[45],{"path":46,"resourceType":47,"resourceTypeDesc":48,"sizeBytes":49,"sourceHtmlUrl":50},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fengineering\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[52,59,66,73,80,87],{"skillNo":53,"name":54,"nameZh":6,"description":55,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":56,"categories":57,"keywords":58,"publishedAt":19},"01M7AAQ0A5XBE41G2EX4262V9M","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fproductivity\u002Fwriting-for-agents\u002FSKILL.md",[],[],{"skillNo":60,"name":61,"nameZh":6,"description":62,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":63,"categories":64,"keywords":65,"publishedAt":19},"01M7AAPYSRZRQR8Z6M1XXF6D8H","wait-what","Stop. That last message did not land — re-pitch it.","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fproductivity\u002Fwait-what\u002FSKILL.md",[],[],{"skillNo":67,"name":68,"nameZh":6,"description":69,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":70,"categories":71,"keywords":72,"publishedAt":19},"01M7AAPWP7FWHZWJD2D56AXFME","to-questionnaire","Turn a decision you can't fully answer into a questionnaire for someone else to fill in.","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fproductivity\u002Fto-questionnaire\u002FSKILL.md",[],[],{"skillNo":74,"name":75,"nameZh":6,"description":76,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":77,"categories":78,"keywords":79,"publishedAt":19},"01M7AAPTHRA22FFN354NR4GZPF","teach","Teach the user a new skill or concept, within this workspace.","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fproductivity\u002Fteach\u002FSKILL.md",[],[],{"skillNo":81,"name":82,"nameZh":6,"description":83,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":84,"categories":85,"keywords":86,"publishedAt":19},"01M7AAPRG0TVS3KFHRMD2RE7Y0","handoff","Compact the current conversation into a handoff document for another agent to pick up.","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fproductivity\u002Fhandoff\u002FSKILL.md",[],[],{"skillNo":88,"name":89,"nameZh":6,"description":90,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":91,"categories":92,"keywords":93,"publishedAt":19},"01M7AAPPBRBDQRTR36MY0V35MJ","grilling","Grill the user relentlessly about a plan, decision, or idea. Use when the user wants to stress-test their thinking, or uses any 'grill' trigger phrases.","https:\u002F\u002Fgithub.com\u002FPoom5741\u002Fai-sdlc-course\u002Fblob\u002Fmain\u002F.pi\u002Fskills\u002Fmattpocock\u002Fproductivity\u002Fgrilling\u002FSKILL.md",[],[]]