[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M79C4JWTT184T4MDPTYZ6T97":3,"skill-same:01M79C4JWTT184T4MDPTYZ6T97":49},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":15,"categories":16,"keywords":17,"publishedAt":18,"linkOnly":19,"markdownContent":20,"markdownBody":21,"frontMatter":22,"refName":23,"commitSha":24,"skillDirectory":25,"forksCount":13,"repositoryHtmlUrl":26,"repositoryHomepageUrl":6,"ownerHtmlUrl":27,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":28,"install":29,"resources":42},"01M79C4JWTT184T4MDPTYZ6T97","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","inprealpha\u002Fmatt-skills-1dot2","inprealpha","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F10178348?v=4","01M7260FPQVZRRZEPS565DEYPM","01M79C34BAJ24BM4KQ8NJN7JXJ",0,"MIT","https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\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},"release\u002Fv1.2","9c32629965586e75a9d2206922dccec91e19f2f2","skills\u002Fengineering\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2","https:\u002F\u002Fgithub.com\u002Finprealpha","2026-07-19 14:14:01",{"source":8,"skillName":5,"commands":30,"prompt":40,"zipAvailable":41},[31,34,37],{"tool":32,"command":33},"npx","npx skills add inprealpha\u002Fmatt-skills-1dot2 --skill resolving-merge-conflicts",{"tool":35,"command":36},"bunx","bunx skills add inprealpha\u002Fmatt-skills-1dot2 --skill resolving-merge-conflicts",{"tool":38,"command":39},"pnpm","pnpm dlx skills add inprealpha\u002Fmatt-skills-1dot2 --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fengineering\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[43],{"path":44,"resourceType":45,"resourceTypeDesc":46,"sizeBytes":47,"sourceHtmlUrl":48},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fengineering\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[50,57,64,71,78,85],{"skillNo":51,"name":52,"nameZh":6,"description":53,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":54,"categories":55,"keywords":56,"publishedAt":18},"01M79C6Q3C780676ZE0B4T9312","writing-great-skills","Reference for writing and editing skills well — the vocabulary and principles that make a skill predictable.","https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fproductivity\u002Fwriting-great-skills\u002FSKILL.md",[],[],{"skillNo":58,"name":59,"nameZh":6,"description":60,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":61,"categories":62,"keywords":63,"publishedAt":18},"01M79C6N3XXEQA1H83TH30KRV3","teach","Teach the user a new skill or concept, within this workspace.","https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fproductivity\u002Fteach\u002FSKILL.md",[],[],{"skillNo":65,"name":66,"nameZh":6,"description":67,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":68,"categories":69,"keywords":70,"publishedAt":18},"01M79C6HVAYT6QVE4ASDEPQ7SV","handoff","Compact the current conversation into a handoff document for another agent to pick up.","https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fproductivity\u002Fhandoff\u002FSKILL.md",[],[],{"skillNo":72,"name":73,"nameZh":6,"description":74,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":75,"categories":76,"keywords":77,"publishedAt":18},"01M79C6FV81MPH8KRH686P1VR2","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\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fproductivity\u002Fgrilling\u002FSKILL.md",[],[],{"skillNo":79,"name":80,"nameZh":6,"description":81,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":82,"categories":83,"keywords":84,"publishedAt":18},"01M79C6E2423MFEW4NYYHGT5DD","grill-me","A relentless interview to sharpen a plan or design.","https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fproductivity\u002Fgrill-me\u002FSKILL.md",[],[],{"skillNo":86,"name":87,"nameZh":6,"description":88,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":89,"categories":90,"keywords":91,"publishedAt":18},"01M79C6BR0JJPBQR4TZPTSWYVM","obsidian-vault","Search, create, and manage notes in the Obsidian vault with wikilinks and index notes. Use when user wants to find, create, or organize notes in Obsidian.","https:\u002F\u002Fgithub.com\u002Finprealpha\u002Fmatt-skills-1dot2\u002Fblob\u002Frelease\u002Fv1.2\u002Fskills\u002Fpersonal\u002Fobsidian-vault\u002FSKILL.md",[],[]]