[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7F19YSH0SEWPMCDTH4K7945":3,"skill-same:01M7F19YSH0SEWPMCDTH4K7945":56},{"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":16,"sourceHtmlUrl":17,"categories":18,"keywords":19,"publishedAt":20,"linkOnly":21,"markdownContent":22,"markdownBody":23,"frontMatter":24,"refName":25,"commitSha":26,"skillDirectory":27,"forksCount":14,"repositoryHtmlUrl":28,"repositoryHomepageUrl":6,"ownerHtmlUrl":29,"ownerBlogUrl":6,"ownerDescription":30,"updatedAt":31,"install":32,"resources":45},"01M7F19YSH0SEWPMCDTH4K7945","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","willgosnold\u002Fwillyskills","willgosnold","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F90176365?v=4","01M7F13J2VJ2R4DZHPQY7P92A0","Will Gosnold","01M7F13J4G8214K2JKYEA762Y3",0,"MIT","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fresolving-merge-conflicts\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",[],[],"2026-11-16 10:05:34",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","bf8728510e93709b822a8ea5ea996ee89aebb031","skills\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills","https:\u002F\u002Fgithub.com\u002Fwillgosnold","Independent AI safety research | London | MSc @ University of Exeter ","2026-11-14 17:27:06",{"source":8,"skillName":5,"commands":33,"prompt":43,"zipAvailable":44},[34,37,40],{"tool":35,"command":36},"npx","npx skills add willgosnold\u002Fwillyskills --skill resolving-merge-conflicts",{"tool":38,"command":39},"bunx","bunx skills add willgosnold\u002Fwillyskills --skill resolving-merge-conflicts",{"tool":41,"command":42},"pnpm","pnpm dlx skills add willgosnold\u002Fwillyskills --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[46,52],{"path":47,"resourceType":48,"resourceTypeDesc":49,"sizeBytes":50,"sourceHtmlUrl":51},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",{"path":53,"resourceType":53,"resourceTypeDesc":54,"sizeBytes":55,"sourceHtmlUrl":16},"LICENSE","许可证",1068,[57,65,73,81,89,97],{"skillNo":58,"name":59,"nameZh":6,"description":60,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":61,"sourceHtmlUrl":62,"categories":63,"keywords":64,"publishedAt":20},"01M7F1B4EQRK76ZDCBTEJHCVZR","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fwriting-for-agents\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fwriting-for-agents\u002FSKILL.md",[],[],{"skillNo":66,"name":67,"nameZh":6,"description":68,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":69,"sourceHtmlUrl":70,"categories":71,"keywords":72,"publishedAt":20},"01M7F1A10WJ1GQ14X330700ND2","setup-matt-pocock-skills","Configure this repo for the engineering skills: set up its issue tracker, triage label vocabulary, and domain doc layout. Run once before first use of the other engineering skills.","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fsetup-matt-pocock-skills\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fsetup-matt-pocock-skills\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":77,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":20},"01M7F19V9H8RMCKXRFCTEXH3WX","research","Investigate a question against high-trust primary sources and capture the findings as a Markdown file in the repo. Use when the user wants a topic researched, docs or API facts gathered, or reading legwork delegated to a background agent.","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fresearch\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fresearch\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":85,"sourceHtmlUrl":86,"categories":87,"keywords":88,"publishedAt":20},"01M7F19H878ASFK9V8D3HJ6YET","pstack","Subagent briefs the other pstack skills hand to their subagents. Not a task skill.","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fpstack\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fpstack\u002FSKILL.md",[],[],{"skillNo":90,"name":91,"nameZh":6,"description":92,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":93,"sourceHtmlUrl":94,"categories":95,"keywords":96,"publishedAt":20},"01M7F16Q9B60NNTQQ90MAECYN3","matt-tdd","Test-driven development. Use when the user wants to build features or fix bugs test-first, mentions \"red-green-refactor\", or wants integration tests.","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fmatt-tdd\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fmatt-tdd\u002FSKILL.md",[],[],{"skillNo":98,"name":99,"nameZh":6,"description":100,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":101,"sourceHtmlUrl":102,"categories":103,"keywords":104,"publishedAt":20},"01M7F15ZCK14PMB3A3X3DDNWAF","implement","Implement a piece of work based on a spec or set of tickets.","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fimplement\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fwillgosnold\u002Fwillyskills\u002Fblob\u002Fmain\u002Fskills\u002Fimplement\u002FSKILL.md",[],[]]