[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7A9X286RCXZCCYKFD5RDHJS":3,"skill-same:01M7A9X286RCXZCCYKFD5RDHJS":49},{"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":13,"repositoryHtmlUrl":26,"repositoryHomepageUrl":6,"ownerHtmlUrl":27,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":28,"install":29,"resources":42},"01M7A9X286RCXZCCYKFD5RDHJS","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","aixia715\u002Fcapture-tcl-ai-bridge","aixia715","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F26791215?v=4","01M7A9VZFCYV21TRFPT3R8XRJC","01M7A9VZGEWSTHG96CBC5TEWTV",1,"MIT","https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\r\nname: resolving-merge-conflicts\r\ndescription: \"Use when you need to resolve an in-progress git merge\u002Frebase conflict.\"\r\n---\r\n\r\n1. **See the current state** of the merge\u002Frebase. Check git history, and the conflicting files.\r\n\r\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.\r\n\r\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`.\r\n\r\n4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.\r\n\r\n5. **Finish the merge\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\r\n","1. **See the current state** of the merge\u002Frebase. Check git history, and the conflicting files.\r\n\r\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.\r\n\r\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`.\r\n\r\n4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.\r\n\r\n5. **Finish the merge\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\r\n",{"name":5,"description":7},"main","fdd03bced1f0ed38ab3f2d3ed8f4c2448e4c084d",".agents\u002Fskills\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge","https:\u002F\u002Fgithub.com\u002Faixia715","2026-11-14 00:15:22",{"source":8,"skillName":5,"commands":30,"prompt":40,"zipAvailable":41},[31,34,37],{"tool":32,"command":33},"npx","npx skills add aixia715\u002Fcapture-tcl-ai-bridge --skill resolving-merge-conflicts",{"tool":35,"command":36},"bunx","bunx skills add aixia715\u002Fcapture-tcl-ai-bridge --skill resolving-merge-conflicts",{"tool":38,"command":39},"pnpm","pnpm dlx skills add aixia715\u002Fcapture-tcl-ai-bridge --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[43],{"path":44,"resourceType":45,"resourceTypeDesc":46,"sizeBytes":47,"sourceHtmlUrl":48},"agents\u002Fopenai.yaml","REFERENCE","参考文档",116,"https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[50,57,64,71,78,85],{"skillNo":51,"name":52,"nameZh":6,"description":53,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":54,"categories":55,"keywords":56,"publishedAt":18},"01M7A9Y2D76VAC2CN9786VVSSN","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fwriting-for-agents\u002FSKILL.md",[],[],{"skillNo":58,"name":59,"nameZh":6,"description":60,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":61,"categories":62,"keywords":63,"publishedAt":18},"01M7A9XYZGC82Y6DNHWZB3T6J3","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\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fwizard\u002FSKILL.md",[],[],{"skillNo":65,"name":66,"nameZh":6,"description":67,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":68,"categories":69,"keywords":70,"publishedAt":18},"01M7A9XTECSACJWAH6JRQB0NQF","wayfinder","Plan a huge chunk of work — more than one agent session can hold — as a shared map of decision tickets on your issue tracker, and resolve them one at a time until the way to the destination is clear.","https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fwayfinder\u002FSKILL.md",[],[],{"skillNo":72,"name":73,"nameZh":6,"description":74,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":75,"categories":76,"keywords":77,"publishedAt":18},"01M7A9XRPRDFNFSHY57GE9FWSA","wait-what","Stop. That last message did not land — re-pitch it.","https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fwait-what\u002FSKILL.md",[],[],{"skillNo":79,"name":80,"nameZh":6,"description":81,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":82,"categories":83,"keywords":84,"publishedAt":18},"01M7A9XNY7VERCSC1DACMQBEHM","triage","Move issues and external PRs through a state machine of triage roles — categorise, verify, grill if needed, and write agent-ready briefs.","https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Ftriage\u002FSKILL.md",[],[],{"skillNo":86,"name":87,"nameZh":6,"description":88,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":89,"categories":90,"keywords":91,"publishedAt":18},"01M7A9XHMBKY1JF86MHS0FSTSG","to-tickets","Break a plan, spec, or the current conversation into a set of tracer-bullet tickets, each declaring its blocking edges, published to the configured tracker — edges as text in one file per ticket locally, or native blocking links on a real tracker.","https:\u002F\u002Fgithub.com\u002Faixia715\u002Fcapture-tcl-ai-bridge\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fto-tickets\u002FSKILL.md",[],[]]