[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7CXY019FTRSY7MGZ0NCYMYD":3,"skill-same:01M7CXY019FTRSY7MGZ0NCYMYD":52},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"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":26,"repositoryHtmlUrl":27,"repositoryHomepageUrl":28,"ownerHtmlUrl":29,"ownerBlogUrl":30,"ownerDescription":6,"updatedAt":31,"install":32,"resources":45},"01M7CXY019FTRSY7MGZ0NCYMYD","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","BotHarness\u002FDeepSeekBot","BotHarness","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F330270786?v=4","01M7CX37EXWM53FHAQ28JNKZTZ","01M7CX37FHA8NY5D2KXFZWV63Y",852,"MIT","https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002F.agents\u002Fskills\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","d922e716d0801fbdf6c27f023b245c8da7e4c804",".agents\u002Fskills\u002Fresolving-merge-conflicts",63,"https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot","https:\u002F\u002Ftobs.app","https:\u002F\u002Fgithub.com\u002FBotHarness","https:\u002F\u002Fdeepseekbot.app\u002F","2026-11-15 06:17:31",{"source":8,"skillName":5,"commands":33,"prompt":43,"zipAvailable":44},[34,37,40],{"tool":35,"command":36},"npx","npx skills add BotHarness\u002FDeepSeekBot --skill resolving-merge-conflicts",{"tool":38,"command":39},"bunx","bunx skills add BotHarness\u002FDeepSeekBot --skill resolving-merge-conflicts",{"tool":41,"command":42},"pnpm","pnpm dlx skills add BotHarness\u002FDeepSeekBot --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[46],{"path":47,"resourceType":48,"resourceTypeDesc":49,"sizeBytes":50,"sourceHtmlUrl":51},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[53,60,67,74,81,88],{"skillNo":54,"name":55,"nameZh":6,"description":56,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":57,"categories":58,"keywords":59,"publishedAt":18},"01M7CY5WHFGASZATK5CQF05G0A","slide-authoring","Technical reference for writing or editing open-slide pages — file contract, 1920×1080 canvas, type scale, layout, palette\u002Fvisual direction, assets, speaker notes, stepped reveals, page transitions, and morph transitions. Consult this whenever you are about to write or modify any file under `slides\u002F\u003Cid>\u002F`, including from inside the `create-slide` or `apply-comments` workflows, or for any ad-hoc slide edit. Triggers on phrases like \"edit slide\", \"tweak this page\", \"fix the layout\", \"change the palette\", \"reveal one by one\", \"add a transition\", \"morph transition\", \"write the speaker notes\", \"generate the script \u002F talk track\", \"investigate the slide framework\", \"how do slides work here\".","https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002Fapps\u002Fpresentations\u002F.agents\u002Fskills\u002Fslide-authoring\u002FSKILL.md",[],[],{"skillNo":61,"name":62,"nameZh":6,"description":63,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":64,"categories":65,"keywords":66,"publishedAt":18},"01M7CY5NMS099ZRH9ECYS47ZKG","current-slide","Resolve which slide, page, and (optionally) selected element the user is currently viewing in the open-slide dev server. Consult this whenever the user references \"this page\", \"this slide\", \"this element\", \"the slide I'm on\", \"the current page\", or any deictic reference to slide content without naming it. Re-read `node_modules\u002F.open-slide\u002Fcurrent.json` at the start of every such turn — the user navigates between turns, so a value you read earlier in the conversation is almost certainly stale.","https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002Fapps\u002Fpresentations\u002F.agents\u002Fskills\u002Fcurrent-slide\u002FSKILL.md",[],[],{"skillNo":68,"name":69,"nameZh":6,"description":70,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":71,"categories":72,"keywords":73,"publishedAt":18},"01M7CY5G6XHNY7Y8KVGGKF654E","create-theme","Use this skill when the user wants to create, draft, author, or extract a slide theme in this open-slide repo. Triggers on phrases like \"create a theme\", \"make a theme called X\", \"extract a theme from \u003Cslide>\", \"build a theme from these images\". Produces two paired files under `themes\u002F` — `\u003Cid>.md` (palette, typography, layout, fixed Title\u002FFooter components, motion) and `\u003Cid>.demo.tsx` (a runnable demo slide that the dev-UI Themes panel previews). Do NOT use for editing real slides — only for authoring the theme bundle.","https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002Fapps\u002Fpresentations\u002F.agents\u002Fskills\u002Fcreate-theme\u002FSKILL.md",[],[],{"skillNo":75,"name":76,"nameZh":6,"description":77,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":18},"01M7CY5B0DZNEVRY95X3QEKW3C","create-slide","Use this skill when the user wants to create, draft, author, or generate new slides \u002F a presentation in this open-slide repo. Triggers on phrases like \"make slides about X\", \"make a deck about X\", \"create a presentation\", \"draft slides for\", \"new slide\", \"a deck with speaker notes \u002F a script\", or when the user asks to add content under `slides\u002F`. Do NOT use for editing the framework itself — only for authoring content inside `slides\u002F\u003Cid>\u002F`.","https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002Fapps\u002Fpresentations\u002F.agents\u002Fskills\u002Fcreate-slide\u002FSKILL.md",[],[],{"skillNo":82,"name":83,"nameZh":6,"description":84,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":85,"categories":86,"keywords":87,"publishedAt":18},"01M7CY57ED279GA6QC3BFMPXG5","apply-comments","Apply pending @slide-comment markers written by the open-slide inspector tool. Use when the user asks to \"apply comments\", \"process slide comments\", \"apply the inspector comments\", or references markers left inside `slides\u002F\u003Cid>\u002Findex.tsx`.","https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002Fapps\u002Fpresentations\u002F.agents\u002Fskills\u002Fapply-comments\u002FSKILL.md",[],[],{"skillNo":89,"name":90,"nameZh":6,"description":91,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":92,"categories":93,"keywords":94,"publishedAt":18},"01M7CY53ZCYB0P3GYM2V3MEN1N","writing-shape","Writing, exploit: shape raw material into an article, paragraph by paragraph.","https:\u002F\u002Fgithub.com\u002FBotHarness\u002FDeepSeekBot\u002Fblob\u002Fmain\u002Fagent\u002Fskills\u002Fwriting-shape\u002FSKILL.md",[],[]]