[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M78FP4BSVS8CERCSCJ11GHC0":3,"skill-same:01M78FP4BSVS8CERCSCJ11GHC0":50},{"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":6,"updatedAt":29,"install":30,"resources":43},"01M78FP4BSVS8CERCSCJ11GHC0","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","fschwiet\u002Fhonist-v","fschwiet","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F222328?v=4","01M78FN2CHZJWBJQ7QGY7JDGBK","Frank","01M78FN2D6WBQQ07CV3R79V79M",0,"MIT","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fmattpocock-skills\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","e8a43a7014c4bfc30a1e51cf05a81fbece745669","plugin\u002Fskills\u002Fmattpocock-skills\u002Fengineering\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v","https:\u002F\u002Fgithub.com\u002Ffschwiet","2026-11-08 03:21:07",{"source":8,"skillName":5,"commands":31,"prompt":41,"zipAvailable":42},[32,35,38],{"tool":33,"command":34},"npx","npx skills add fschwiet\u002Fhonist-v --skill resolving-merge-conflicts",{"tool":36,"command":37},"bunx","bunx skills add fschwiet\u002Fhonist-v --skill resolving-merge-conflicts",{"tool":39,"command":40},"pnpm","pnpm dlx skills add fschwiet\u002Fhonist-v --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fmattpocock-skills\u002Fengineering\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[44],{"path":45,"resourceType":46,"resourceTypeDesc":47,"sizeBytes":48,"sourceHtmlUrl":49},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fmattpocock-skills\u002Fengineering\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[51,58,65,72,79,86],{"skillNo":52,"name":53,"nameZh":6,"description":54,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":55,"categories":56,"keywords":57,"publishedAt":19},"01M78FQ9X3171KQYNFT89TKKYV","sync-skills-openai-yaml","Sync every skill's agents\u002Fopenai.yaml with its SKILL.md — display name, short description, and implicit-invocation policy.","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fsync-skills-openai-yaml\u002FSKILL.md",[],[],{"skillNo":59,"name":60,"nameZh":6,"description":61,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":62,"categories":63,"keywords":64,"publishedAt":19},"01M78FQ6N0F9AC5TE2H1P5SX8E","streamlined-setup-matt-pocock-skills","Configure this repo for the engineering skills using one fixed set of choices: local-markdown issue tracker, default triage labels, single-context domain docs. Overwrites any earlier setup. Run once per repo.","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fstreamlined-setup-matt-pocock-skills\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":6,"sourceHtmlUrl":69,"categories":70,"keywords":71,"publishedAt":19},"01M78FQ43YA757CE75J1107H22","retire-provisional-documents","Retire provisional documentation after making its consumers self-contained and preserving only durable domain language and decision rationale.","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fretire-provisional-documents\u002FSKILL.md",[],[],{"skillNo":73,"name":74,"nameZh":6,"description":75,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":76,"categories":77,"keywords":78,"publishedAt":19},"01M78FQ1TBFXGS929WWHC9G93P","coding-agent-sessions","Find, read, list, search, inspect, fetch, export, or reconstruct coding-agent sessions across various agents.","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Foh-my-openagent\u002Fcoding-agent-sessions\u002FSKILL.md",[],[],{"skillNo":80,"name":81,"nameZh":6,"description":82,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":83,"categories":84,"keywords":85,"publishedAt":19},"01M78FQ01AK703N37Q2AMTG6NP","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fmattpocock-skills\u002Fproductivity\u002Fwriting-for-agents\u002FSKILL.md",[],[],{"skillNo":87,"name":88,"nameZh":6,"description":89,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":90,"categories":91,"keywords":92,"publishedAt":19},"01M78FPYN3J3S3J05XZ2VWJ629","wait-what","Stop. That last message did not land: re-pitch it.","https:\u002F\u002Fgithub.com\u002Ffschwiet\u002Fhonist-v\u002Fblob\u002Fmain\u002Fplugin\u002Fskills\u002Fmattpocock-skills\u002Fproductivity\u002Fwait-what\u002FSKILL.md",[],[]]