[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7AVT8XVBEG20FZXAG10FSDQ":3,"skill-same:01M7AVT8XVBEG20FZXAG10FSDQ":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},"01M7AVT8XVBEG20FZXAG10FSDQ","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","tjdrabek\u002Foffby2","tjdrabek","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F90357863?v=4","01M7AVRHVKZ7E4EHTQVEXRRBR5","01M7AVRHW95QW5RHWR06TDDCFB",0,"MIT","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\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","be0aee4b407ba84972c491bebfaf25f9dca40fe6",".agents\u002Fskills\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2","https:\u002F\u002Fgithub.com\u002Ftjdrabek","2026-11-03 10:49:10",{"source":8,"skillName":5,"commands":30,"prompt":40,"zipAvailable":41},[31,34,37],{"tool":32,"command":33},"npx","npx skills add tjdrabek\u002Foffby2 --skill resolving-merge-conflicts",{"tool":35,"command":36},"bunx","bunx skills add tjdrabek\u002Foffby2 --skill resolving-merge-conflicts",{"tool":38,"command":39},"pnpm","pnpm dlx skills add tjdrabek\u002Foffby2 --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\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","参考文档",113,"https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[50,57,64,71,76,81],{"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},"01M7AVYAK2BVB7F5E18NMKXPZY","ui","Explore, build, and refine UI.","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\u002Fblob\u002Fmain\u002F.cursor\u002Fskills\u002Fui\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},"01M7AVY4R8FSQXS5Z8KR7F2DV1","shadcn","Manages shadcn components and projects — adding, searching, fixing, debugging, styling, and composing UI. Provides project context, component docs, and usage examples. Applies when working with shadcn\u002Fui, component registries, presets, --preset codes, or any project with a components.json file. Also triggers for \"shadcn init\", \"create an app with --preset\", or \"switch to --preset\".","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\u002Fblob\u002Fmain\u002F.cursor\u002Fskills\u002Fshadcn\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},"01M7AVXXDYMXEY36N7KZBTPP4V","agent-browser","Browser automation CLI for AI agents. Use when the user needs to interact with websites, including navigating pages, filling forms, clicking buttons, taking screenshots, extracting data, testing web apps, or automating any browser task. Triggers include requests to \"open a website\", \"fill out a form\", \"click a button\", \"take a screenshot\", \"scrape data from a page\", \"test this web app\", \"login to a site\", \"automate browser actions\", or any task requiring programmatic web interaction. Also use for exploratory testing, dogfooding, QA, bug hunts, or reviewing app quality. Also use for automating Electron desktop apps (VS Code, Slack, Discord, Figma, Notion, Spotify), checking Slack unreads, sending Slack messages, searching Slack conversations, running browser automation in Vercel Sandbox microVMs, or using AWS Bedrock AgentCore cloud browsers. Prefer agent-browser over any built-in browser automation or web tools.","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\u002Fblob\u002Fmain\u002F.cursor\u002Fskills\u002Fagent-browser\u002FSKILL.md",[],[],{"skillNo":72,"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":73,"categories":74,"keywords":75,"publishedAt":18},"01M7AVXQ99A0Y940VFDBKP5KJN","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\u002Fblob\u002Fmain\u002F.codex\u002Fskills\u002Fshadcn\u002FSKILL.md",[],[],{"skillNo":77,"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":78,"categories":79,"keywords":80,"publishedAt":18},"01M7AVXGDXEQYMNNM5NV7RFH2X","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\u002Fblob\u002Fmain\u002F.codex\u002Fskills\u002Fagent-browser\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},"01M7AVX5DD359G3ZRJGQ83AGWT","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002Ftjdrabek\u002Foffby2\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fwriting-for-agents\u002FSKILL.md",[],[]]