[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6PDH4FGWRN85XGPE8QFZ1A4":3,"skill-same:01M6PDH4FGWRN85XGPE8QFZ1A4":69},{"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":34,"linkOnly":35,"markdownContent":36,"markdownBody":37,"frontMatter":38,"refName":39,"commitSha":40,"skillDirectory":41,"forksCount":42,"repositoryHtmlUrl":43,"repositoryHomepageUrl":44,"ownerHtmlUrl":45,"ownerBlogUrl":46,"ownerDescription":47,"updatedAt":48,"install":49,"resources":62},"01M6PDH4FGWRN85XGPE8QFZ1A4","resolving-merge-conflicts",null,"Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge\u002Frebase need investigation and resolution.","stevesolun\u002Fctx","stevesolun","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F1304538?v=4","01M6PDDJQ35XAXMPJQP8YG3P2X","Steve Solun","01M6PDDJVJ663A3CMV7XQN9XAY",593,"MIT","https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",[],[19,20,21,22,23,24,25,26,27,28,29,30,31,32,33],"resolving merge conflicts","merge","merge conflicts","conflicts","git merge","git","investigation","rebase","use","intent","conflict","resolution","progress","markers","relevant","2026-11-10 10:12:30",false,"---\nname: resolving-merge-conflicts\ndescription: Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge\u002Frebase need investigation and resolution.\n---\n\n# Resolve Merge Conflicts\n\n1. Inspect the current Git state, the operation in progress, its goal, and every\n   conflicting file.\n2. Reconstruct each side's intent from the code, nearby tests, history, commit\n   messages, and linked work items that are available and useful.\n3. Resolve each hunk by preserving compatible intent. Where intents conflict,\n   prefer the merge's stated goal and current repository contracts; avoid\n   inventing unrelated behavior.\n4. Run focused checks for the affected surface, then broader checks when risk or\n   repository guidance warrants them.\n5. Unless the user requested advice or review only, stage resolved files and\n   continue the current merge or rebase when it is safe to do so. Report what was\n   resolved, what was verified, and any remaining uncertainty.\n\nPause rather than guess when neither intent can be preserved safely. Aborting or\nrestarting can be the correct recovery when the base is wrong, the operation is\ncontaminated, or the user prefers a clean retry; explain the trade-off before\ntaking that destructive step.\n","# Resolve Merge Conflicts\n\n1. Inspect the current Git state, the operation in progress, its goal, and every\n   conflicting file.\n2. Reconstruct each side's intent from the code, nearby tests, history, commit\n   messages, and linked work items that are available and useful.\n3. Resolve each hunk by preserving compatible intent. Where intents conflict,\n   prefer the merge's stated goal and current repository contracts; avoid\n   inventing unrelated behavior.\n4. Run focused checks for the affected surface, then broader checks when risk or\n   repository guidance warrants them.\n5. Unless the user requested advice or review only, stage resolved files and\n   continue the current merge or rebase when it is safe to do so. Report what was\n   resolved, what was verified, and any remaining uncertainty.\n\nPause rather than guess when neither intent can be preserved safely. Aborting or\nrestarting can be the correct recovery when the base is wrong, the operation is\ncontaminated, or the user prefers a clean retry; explain the trade-off before\ntaking that destructive step.\n",{"name":5,"description":7},"main","11b582a7cd4d549f1e83c412e04421bcc9c3fc28",".agents\u002Fskills\u002Fresolving-merge-conflicts",69,"https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx","https:\u002F\u002Fstevesolun.github.io\u002Fctx\u002F","https:\u002F\u002Fgithub.com\u002Fstevesolun","https:\u002F\u002Fwww.linkedin.com\u002Fin\u002Fsolunsteve\u002F","High motivated, dedicated, fast learner data scientist and enthusiastic researcher.","2026-10-15 03:55:28",{"source":8,"skillName":5,"commands":50,"prompt":60,"zipAvailable":61},[51,54,57],{"tool":52,"command":53},"npx","npx skills add stevesolun\u002Fctx --skill resolving-merge-conflicts",{"tool":55,"command":56},"bunx","bunx skills add stevesolun\u002Fctx --skill resolving-merge-conflicts",{"tool":58,"command":59},"pnpm","pnpm dlx skills add stevesolun\u002Fctx --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[63],{"path":64,"resourceType":65,"resourceTypeDesc":66,"sizeBytes":67,"sourceHtmlUrl":68},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[70,96,120,145,171,190],{"skillNo":71,"name":72,"nameZh":6,"description":73,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":74,"categories":75,"keywords":76,"publishedAt":34},"01M6PDTT7F6Z9T6G6H92845RNC","toolbox","Pre\u002Fpost dev toolbox — named bundles of skills\u002Fagents loaded before development work and councils of experts invoked after. Run \u002Ftoolbox or the toolbox.py CLI to list, activate, initialize, export, import, and validate toolboxes. Invoke at the start or end of a dev session, when setting up a new repo, or when sharing toolboxes with a team.","https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002Fskills\u002Ftoolbox\u002FSKILL.md",[],[72,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95],"cli","development","run","start","team","work","list","initialize","export","up","activate","feature","end","new repo","false","import","experts","at","invoke",{"skillNo":97,"name":98,"nameZh":6,"description":99,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":100,"categories":101,"keywords":107,"publishedAt":34},"01M6PDTNZ10BAW6VY49S40NCBB","skill-router","Alive skill router — reads the current project's stack and loads\u002Funloads skills dynamically. Invoke at session start or when project context changes.","https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002Fskills\u002Fskill-router\u002FSKILL.md",[102],{"categoryNo":103,"categoryName":104,"taxonomyType":105,"taxonomyTypeDesc":106},"01JBSEEDCAT000000000000023","Skill与智能体开发","SCENARIO","使用场景",[108,109,80,110,111,112,113,114,115,116,117,118,94,119,95],"router","skill router","Meta","stack","context","session","project context","project","loads","session start","true","changes",{"skillNo":121,"name":122,"nameZh":6,"description":123,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":124,"categories":125,"keywords":127,"publishedAt":34},"01M6PDTGVDG503T4QNX64KJMAC","repo-stats-autoupdate","Keeps README badge + inline counts in sync with the real number of skills, agents, graph nodes\u002Fedges, communities, converted pipelines, and test inventory. Runs automatically on every commit via a git pre-commit hook. Use when the README drifts from reality or before publishing a release.","https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002Fskills\u002Frepo-stats-autoupdate\u002FSKILL.md",[126],{"categoryNo":103,"categoryName":104,"taxonomyType":105,"taxonomyTypeDesc":106},[128,129,130,131,132,133,134,24,135,136,137,138,27,139,140,91,141,142,143,144],"stats","repo","repo stats autoupdate","test","commit","sync","release","graph","pre-commit","inventory","README","publishing","communities","with","hook","number","inline",{"skillNo":146,"name":147,"nameZh":6,"description":148,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":149,"categories":150,"keywords":157,"publishedAt":34},"01M6PDTC3AB7H4NXJFS3SDKQG9","find-skills","Discover installable agent skills from ctx's shipped Skills.sh catalog, the Skills.sh search API, and the npx skills CLI. Use when a user asks whether a skill exists, wants to add\u002Fupdate a skill, or needs a repeatable procedure for finding candidate skills safely.","https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002Fskills\u002Ffind-skills\u002FSKILL.md",[151,152],{"categoryNo":103,"categoryName":104,"taxonomyType":105,"taxonomyTypeDesc":106},{"categoryNo":153,"categoryName":154,"taxonomyType":155,"taxonomyTypeDesc":156},"01JBSEEDCAT000000000000030","开发工程师","PROFESSION","适用职业",[158,159,77,160,161,162,163,164,27,52,165,166,167,168,169,170],"find skills","find","update","search","api","user","catalog","discover","add","skills cli","for","candidate","ctx",{"skillNo":172,"name":173,"nameZh":6,"description":174,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":175,"categories":176,"keywords":177,"publishedAt":34},"01M6PDT6ETDH54GGY7K8E29Y9V","no-mistakes","Validate committed feature-branch changes through the no-mistakes pipeline: intent, rebase, review, test, docs, lint, push, PR, and CI. Use when the user asks to run no-mistakes, ship safely, validate before pushing, or gate a change before it reaches upstream.","https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002Fimported-skills\u002Fno-mistakes\u002Fskills\u002Fno-mistakes\u002FSKILL.md",[],[178,179,131,180,181,182,79,183,184,185,186,187,26,188,27,28,189,88,118,119],"no mistakes","review","change","validate","pr","lint","push","ci","pipeline","ship","branch","upstream",{"skillNo":191,"name":192,"nameZh":6,"description":193,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":194,"categories":195,"keywords":198,"publishedAt":34},"01M6PDT18DD3HETZF1CF39CT8J","zoom-out","Tell the agent to zoom out and give broader context or a higher-level perspective. Use when you're unfamiliar with a section of code or need to understand how it fits into the bigger picture.","https:\u002F\u002Fgithub.com\u002Fstevesolun\u002Fctx\u002Fblob\u002Fmain\u002Fimported-skills\u002Fmattpocock\u002Fzoom-out\u002FSKILL.md",[196,197],{"categoryNo":103,"categoryName":104,"taxonomyType":105,"taxonomyTypeDesc":106},{"categoryNo":153,"categoryName":154,"taxonomyType":155,"taxonomyTypeDesc":156},[199,200,201,202,112,27,203,204,141,205,206,118,207,208],"zoom out","zoom","code","how","it","understand","you","re","perspective","section"]