[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M70M2SPP6V0JB8NARV8J24P8":3,"skill-same:01M70M2SPP6V0JB8NARV8J24P8":56},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":15,"categories":16,"keywords":17,"publishedAt":31,"linkOnly":32,"markdownContent":33,"markdownBody":34,"frontMatter":35,"refName":36,"commitSha":37,"skillDirectory":38,"forksCount":13,"repositoryHtmlUrl":39,"repositoryHomepageUrl":6,"ownerHtmlUrl":40,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":41,"install":42,"resources":55},"01M70M2SPP6V0JB8NARV8J24P8","fix-merge-conflicts",null,"Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution","mingster\u002Fdotfiles","mingster","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F528506?v=4","01M6BVP9E23T80TBZM7S0F94RG","01M6BVP9JK6JMSX0SZ2G1VMEDW",1,"MIT","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Ffix-merge-conflicts\u002FSKILL.md",[],[18,19,20,21,22,23,24,25,26,27,28,29,30],"conflicts","merge","fix","fix merge conflicts","merge conflicts","resolution","conflict","build","conflict resolution","resolve merge conflicts","validate","tests","resolve merge","2026-11-10 10:12:30",false,"---\nname: fix-merge-conflicts\ndescription: Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution\n---\n\n# Fix merge conflicts\n\n## Trigger\n\nBranch has unresolved merge conflicts and needs a reliable path to a buildable state.\n\n## Workflow\n\n1. Detect all conflicting files from git status and conflict markers.\n2. Resolve each conflict with minimal, correctness-first edits.\n3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.\n4. Regenerate lockfiles with package manager tools instead of hand-editing.\n5. Run compile, lint, and relevant tests.\n6. Stage resolved files and summarize key decisions.\n\n## Guardrails\n\n- Keep changes minimal and readable.\n- Do not leave conflict markers in any file.\n- Avoid broad refactors while resolving conflicts.\n- Do not push or tag during conflict resolution.\n\n## Output\n\n- Files resolved\n- Notable resolution choices\n- Build\u002Ftest outcome\n","# Fix merge conflicts\n\n## Trigger\n\nBranch has unresolved merge conflicts and needs a reliable path to a buildable state.\n\n## Workflow\n\n1. Detect all conflicting files from git status and conflict markers.\n2. Resolve each conflict with minimal, correctness-first edits.\n3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.\n4. Regenerate lockfiles with package manager tools instead of hand-editing.\n5. Run compile, lint, and relevant tests.\n6. Stage resolved files and summarize key decisions.\n\n## Guardrails\n\n- Keep changes minimal and readable.\n- Do not leave conflict markers in any file.\n- Avoid broad refactors while resolving conflicts.\n- Do not push or tag during conflict resolution.\n\n## Output\n\n- Files resolved\n- Notable resolution choices\n- Build\u002Ftest outcome\n",{"name":5,"description":7},"main","d775d974eade471675ab972f749b4be9bcdad6c3","templates\u002Fagent-team\u002F.agents\u002Fskills\u002Ffix-merge-conflicts","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles","https:\u002F\u002Fgithub.com\u002Fmingster","2026-11-15 03:23:26",{"source":8,"skillName":5,"commands":43,"prompt":53,"zipAvailable":54},[44,47,50],{"tool":45,"command":46},"npx","npx skills add mingster\u002Fdotfiles --skill fix-merge-conflicts",{"tool":48,"command":49},"bunx","bunx skills add mingster\u002Fdotfiles --skill fix-merge-conflicts",{"tool":51,"command":52},"pnpm","pnpm dlx skills add mingster\u002Fdotfiles --skill fix-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Ffix-merge-conflicts\u002FSKILL.md",true,[],[57,87,118,133,152,172],{"skillNo":58,"name":59,"nameZh":6,"description":60,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":61,"categories":62,"keywords":68,"publishedAt":31},"01M70M8J3PA9F7TJA4DK95GE8N","workflow-from-chats","Extract durable working preferences from recent Cursor chats and convert them into skills, rules, or workflow docs. Use when asked to learn preferences, mine feedback, personalize workflows, or generate team\u002Fperson-specific agent guidance.","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Fworkflow-from-chats\u002FSKILL.md",[63],{"categoryNo":64,"categoryName":65,"taxonomyType":66,"taxonomyTypeDesc":67},"01JBSEEDCAT000000000000023","Skill与智能体开发","SCENARIO","使用场景",[69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86],"workflow from chats","workflow","team","feedback","workflows","Rules","use","preferences","guidance","person","cursor","generate","mine","docs","when","extract","learn","convert",{"skillNo":88,"name":89,"nameZh":6,"description":90,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":91,"categories":92,"keywords":98,"publishedAt":31},"01M70M8DK87GX45FFZCC840SW2","why","Use for 'why does X work this way', 'why we picked Y', design rationale, regressions, postmortems, or data-backed thresholds. Discovers available MCPs and queries each evidence category (source control, issue tracker, long-form docs, real-time chat, infrastructure observability, error tracking, product analytics warehouse) in parallel, then returns a cited read on decisions and tradeoffs. Use how for runtime behavior.","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Fwhy\u002FSKILL.md",[93],{"categoryNo":94,"categoryName":95,"taxonomyType":96,"taxonomyTypeDesc":97},"01JBSEEDCAT000000000000033","数据分析师","PROFESSION","适用职业",[89,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117],"product analytics","design","work","product","time","error tracking","how","tracker","read","issue","data","analytics","source","infrastructure","returns","warehouse","parallel","observability","error",{"skillNo":119,"name":120,"nameZh":6,"description":121,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":122,"categories":123,"keywords":124,"publishedAt":31},"01M70M89EYB7RB4WT9EBQ19VEW","what-did-i-get-done","Summarize authored commits over a user-specified time period into a concise update","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Fwhat-did-i-get-done\u002FSKILL.md",[],[125,126,127,128,129,130,103,131,132],"done","what did i get done","get","summarize","user","update","commits","concise",{"skillNo":134,"name":135,"nameZh":6,"description":136,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":137,"categories":138,"keywords":139,"publishedAt":31},"01M70M887Z6CVVHAM294BC9SG3","weekly-review","Produce a weekly synthesis of authored commits with highlights by bugfix, tech debt, and net-new work","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Fweekly-review\u002FSKILL.md",[],[140,141,142,143,144,145,146,147,148,149,131,150,101,151],"weekly","review","weekly review","produce","Synthesis","weekly synthesis","debt","new","tech debt","bugfix","tech","with",{"skillNo":153,"name":154,"nameZh":6,"description":155,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":156,"categories":157,"keywords":158,"publishedAt":31},"01M70M86M3WNW7S7TZ1NVKSGT7","verify-this","Verify a claim with fresh local evidence: restate it falsifiably, capture baseline and treatment, compare artifacts, and return VERIFIED, NOT VERIFIED, or INCONCLUSIVE.","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Fverify-this\u002FSKILL.md",[],[159,160,161,162,163,164,165,166,167,168,169,170,171,151],"verify","verify this","fresh","it","artifacts","capture","restate","verified","claim","local","baseline","evidence","compare",{"skillNo":173,"name":174,"nameZh":6,"description":175,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":176,"categories":177,"keywords":178,"publishedAt":31},"01M70M84C3MN7ASJ0HBFAKT5Z6","typescript-best-practices","TypeScript best practices. Use when reading or editing any .ts or .tsx file.","https:\u002F\u002Fgithub.com\u002Fmingster\u002Fdotfiles\u002Fblob\u002Fmain\u002Ftemplates\u002Fagent-team\u002F.agents\u002Fskills\u002Ftypescript-best-practices\u002FSKILL.md",[],[179,180,181,182,183,83,75,184,185,186],"best practices","typescript best practices","typescript","file","editing","tsx","true","reading"]