[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M79YW1SQBY9YWW2DECBDK2VB":3,"skill-same:01M79YW1SQBY9YWW2DECBDK2VB":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":29,"ownerDescription":6,"updatedAt":30,"install":31,"resources":44},"01M79YW1SQBY9YWW2DECBDK2VB","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","aleksanderwalczuk\u002Fdesign-skills","aleksanderwalczuk","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F33238158?v=4","01M79YRV83X2HEVDBY7HR97EBN","Aleksander Walczuk","01M79YRV8QXM3KJ2MMZBFDMQMK",0,"MIT","https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fmisc\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},"master","928bef4b6e4d7c63185fcbcb7b81a36a9f56cd69","skills\u002Fmisc\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk\u002Fdesign-skills","https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk","https:\u002F\u002Flinkedin.com\u002Fin\u002Faleksanderwalczuk\u002F","2026-08-01 16:34:05",{"source":8,"skillName":5,"commands":32,"prompt":42,"zipAvailable":43},[33,36,39],{"tool":34,"command":35},"npx","npx skills add aleksanderwalczuk\u002Fdesign-skills --skill resolving-merge-conflicts",{"tool":37,"command":38},"bunx","bunx skills add aleksanderwalczuk\u002Fdesign-skills --skill resolving-merge-conflicts",{"tool":40,"command":41},"pnpm","pnpm dlx skills add aleksanderwalczuk\u002Fdesign-skills --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fmisc\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\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fmisc\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},"01M79YXWY2TM3BAWCSW418ATCF","writing-great-skills","Reference for writing and editing skills well — the vocabulary and principles that make a skill predictable.","https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fwriting-great-skills\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},"01M79YXTVAZZKGG7M8ZXV49VRN","teach","Teach the user a new skill or concept, within this workspace.","https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fteach\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},"01M79YXRXEBHAMPPS8HFV8MBQW","handoff","Compact the current conversation into a handoff document for another agent to pick up.","https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fhandoff\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},"01M79YXPK6PT8PB7PQYTCDK5X1","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\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fgrilling\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},"01M79YXMV5DSZ3HDHSSAEGRKQX","grill-me","A relentless interview to sharpen a plan or design.","https:\u002F\u002Fgithub.com\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fgrill-me\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},"01M79YX95AK6750TRR2JWM0YAQ","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\u002Faleksanderwalczuk\u002Fdesign-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fpersonal\u002Fobsidian-vault\u002FSKILL.md",[],[]]