[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7AHF4XN3RS5R2F0HGPZQJZB":3,"skill-same:01M7AHF4XN3RS5R2F0HGPZQJZB":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},"01M7AHF4XN3RS5R2F0HGPZQJZB","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","SamyakJhaveri\u002Floam","SamyakJhaveri","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F39847642?v=4","01M7AH87180VZDSRHE20JD1S32","Samyak Jhaveri","01M7AH871WNGEHDVNXJM2B520R",0,"MIT","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fdocs\u002Farchive\u002Farchitecture-working\u002Ftooling\u002Fmattpocock-skills\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","85a41de587b98bb440cccf78f081a6bee67fe90e","docs\u002Farchive\u002Farchitecture-working\u002Ftooling\u002Fmattpocock-skills\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri","2026-11-15 04:06:30",{"source":8,"skillName":5,"commands":31,"prompt":41,"zipAvailable":42},[32,35,38],{"tool":33,"command":34},"npx","npx skills add SamyakJhaveri\u002Floam --skill resolving-merge-conflicts",{"tool":36,"command":37},"bunx","bunx skills add SamyakJhaveri\u002Floam --skill resolving-merge-conflicts",{"tool":39,"command":40},"pnpm","pnpm dlx skills add SamyakJhaveri\u002Floam --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fdocs\u002Farchive\u002Farchitecture-working\u002Ftooling\u002Fmattpocock-skills\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\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fdocs\u002Farchive\u002Farchitecture-working\u002Ftooling\u002Fmattpocock-skills\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},"01M7AHGVPTGK3JGQ9XYG5XJ6PR","verify-loam","Prove a Loam change in a real rendered project: copier-render this checkout, then drive headless and interactive Claude Code sessions, stubbed Codex runs and copier updates in the render and capture hook, memory, deny-rule, update and check evidence. Use before shipping any seed, hook, settings or copier.yml change.","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fseed\u002F.claude\u002Fskills\u002Fverify-loam\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},"01M7AHGEDXX7GWJ32S9BZAEWAJ","hypothesis-tree","Persistent hypothesis tree for multi-step, multi-session investigations. Use when a \"why does X fail\" question branches into sub-hypotheses that must survive across sessions, or when falsifiable claims need tracking with dated, linked evidence. Maintains one markdown file with add, update, review, and prune subcommands, each gated on verifying the cited evidence file exists and supports the claim. NOT for a single-session bug hunt, a one-command question, or general note-taking.","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fseed\u002F.agents\u002Fskills\u002Fhypothesis-tree\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},"01M7AHGADA1CX9M0B0QSFJYGW5","fable-prompting","Which Claude Fable 5.2 guide sections you can act on from a session, and which Claude Code already injects. Use before writing a Fable session prompt or brief.","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fseed\u002F.agents\u002Fskills\u002Ffable-prompting\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},"01M7AHG7AGBSQ6HH04C70TSM8H","catchup","Read-only session bootstrap briefing of git state, commits, handoff, tasks and red flags. Use when resuming work, starting a fresh session, or unsure of project state.","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fseed\u002F.agents\u002Fskills\u002Fcatchup\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},"01M7AHG52XX2N7AT7JNHS6MN1S","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fdocs\u002Farchive\u002Farchitecture-working\u002Ftooling\u002Fmattpocock-skills\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},"01M7AHG00SXGAGJA7C6XA193J6","wizard","Generate an interactive bash wizard that walks a human through steps only they can perform. Use when provisioning infrastructure, setting up credentials or CI secrets, walking an unfamiliar third-party dashboard, or running a one-off migration or cutover. Don't invoke this for steps the agent can perform itself.","https:\u002F\u002Fgithub.com\u002FSamyakJhaveri\u002Floam\u002Fblob\u002Fmain\u002Fdocs\u002Farchive\u002Farchitecture-working\u002Ftooling\u002Fmattpocock-skills\u002Fwizard\u002FSKILL.md",[],[]]