[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7B2CD6XEHCFFEC22EK03RYM":3,"skill-same:01M7B2CD6XEHCFFEC22EK03RYM":46},{"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":19,"linkOnly":20,"markdownContent":21,"markdownBody":22,"frontMatter":23,"refName":24,"commitSha":25,"skillDirectory":26,"forksCount":27,"repositoryHtmlUrl":28,"repositoryHomepageUrl":6,"ownerHtmlUrl":29,"ownerBlogUrl":6,"ownerDescription":30,"updatedAt":31,"install":32,"resources":45},"01M7B2CD6XEHCFFEC22EK03RYM","fix-merge-conflicts",null,"Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution","ericlitman\u002Fopen-pstack","ericlitman","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F28211?v=4","01M7B2AZ3FNHC7ZM10GTT91Z8A","Eric Litman","01M7B2AZ42W4C26WEE3Y12YHC4",574,"MIT","https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Ffix-merge-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",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","faf512125b11f4a30f55c4eaf8a709a890668406","plugins\u002Fpstack\u002Fskills\u002Ffix-merge-conflicts",90,"https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack","https:\u002F\u002Fgithub.com\u002Fericlitman","Serial optimist, mirth-maker, founder @Healthspanners & @Aescape.","2026-11-09 04:25:18",{"source":8,"skillName":5,"commands":33,"prompt":43,"zipAvailable":44},[34,37,40],{"tool":35,"command":36},"npx","npx skills add ericlitman\u002Fopen-pstack --skill fix-merge-conflicts",{"tool":38,"command":39},"bunx","bunx skills add ericlitman\u002Fopen-pstack --skill fix-merge-conflicts",{"tool":41,"command":42},"pnpm","pnpm dlx skills add ericlitman\u002Fopen-pstack --skill fix-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Ffix-merge-conflicts\u002FSKILL.md",true,[],[47,54,61,68,75,82],{"skillNo":48,"name":49,"nameZh":6,"description":50,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":51,"categories":52,"keywords":53,"publishedAt":19},"01M7B2GYDDVFEN1DMHMX8Y300Q","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\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Fwhy\u002FSKILL.md",[],[],{"skillNo":55,"name":56,"nameZh":6,"description":57,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":58,"categories":59,"keywords":60,"publishedAt":19},"01M7B2GWWKF0ENYRGW6KVAX272","what-did-i-get-done","Summarize authored commits over a user-specified time period into a concise update","https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Fwhat-did-i-get-done\u002FSKILL.md",[],[],{"skillNo":62,"name":63,"nameZh":6,"description":64,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":65,"categories":66,"keywords":67,"publishedAt":19},"01M7B2GVK21EBZQ40EEA9BHDJF","unslop","Cut AI tells from any writing.","https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Funslop\u002FSKILL.md",[],[],{"skillNo":69,"name":70,"nameZh":6,"description":71,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":72,"categories":73,"keywords":74,"publishedAt":19},"01M7B2GT41DP2XC4AJYSNF0A74","typescript-best-practices","TypeScript best practices. Use when reading or editing any .ts or .tsx file.","https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Ftypescript-best-practices\u002FSKILL.md",[],[],{"skillNo":76,"name":77,"nameZh":6,"description":78,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":79,"categories":80,"keywords":81,"publishedAt":19},"01M7B2GQ6HNZNB9R2WJNQ7TS9H","thermo-nuclear-code-quality-review","Run an extremely strict maintainability review for abstraction quality, giant files, and spaghetti-condition growth. Use for a thermo-nuclear code quality review, thermonuclear review, deep code quality audit, or especially harsh maintainability review.","https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Fthermo-nuclear-code-quality-review\u002FSKILL.md",[],[],{"skillNo":83,"name":84,"nameZh":6,"description":85,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":86,"categories":87,"keywords":88,"publishedAt":19},"01M7B2GM0NRQN7X5R9K60BZS0D","technical-writing","Layered technical-writing standard: Diátaxis structure, Google developer style sentences, STE instruction rules, Global English syntax. Use for \u002Ftechnical-writing or when writing or reviewing docs, RFCs, readmes, PR descriptions, or commit messages.","https:\u002F\u002Fgithub.com\u002Fericlitman\u002Fopen-pstack\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Ftechnical-writing\u002FSKILL.md",[],[]]