[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M750AYMA4ZEWRPHW1GAWPMEW":3,"skill-same:01M750AYMA4ZEWRPHW1GAWPMEW":47},{"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":30,"ownerDescription":31,"updatedAt":32,"install":33,"resources":46},"01M750AYMA4ZEWRPHW1GAWPMEW","fix-merge-conflicts",null,"Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution","michael-denyer\u002Fpstack-claude","michael-denyer","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F97485362?v=4","01M7509NWA6PC2Z183SZ6D78FT","Michael Denyer","01M7509NX1YE4AYWW6Y30TCCRV",4309,"MIT","https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Ffix-merge-conflicts\u002FSKILL.md",[],[],"2026-11-12 13:55:43",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","bc09365fe61c725c486ba95157fc4048bf8a0b99","plugins\u002Fpstack\u002Fskills\u002Ffix-merge-conflicts",397,"https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude","https:\u002F\u002Fgithub.com\u002Fmichael-denyer","https:\u002F\u002Fwww.wisdompanel.com\u002F","Software Engineer and Bioinformatician","2026-11-13 23:53:05",{"source":8,"skillName":5,"commands":34,"prompt":44,"zipAvailable":45},[35,38,41],{"tool":36,"command":37},"npx","npx skills add michael-denyer\u002Fpstack-claude --skill fix-merge-conflicts",{"tool":39,"command":40},"bunx","bunx skills add michael-denyer\u002Fpstack-claude --skill fix-merge-conflicts",{"tool":42,"command":43},"pnpm","pnpm dlx skills add michael-denyer\u002Fpstack-claude --skill fix-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Ffix-merge-conflicts\u002FSKILL.md",true,[],[48,55,62,69,76,83],{"skillNo":49,"name":50,"nameZh":6,"description":51,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":52,"categories":53,"keywords":54,"publishedAt":19},"01M750F31RNVHGK1JVWBJHDGTX","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\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Fwhy\u002FSKILL.md",[],[],{"skillNo":56,"name":57,"nameZh":6,"description":58,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":59,"categories":60,"keywords":61,"publishedAt":19},"01M750F17NKT7YCP8ND5675XHN","what-did-i-get-done","Summarize authored commits over a user-specified time period into a concise update","https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Fwhat-did-i-get-done\u002FSKILL.md",[],[],{"skillNo":63,"name":64,"nameZh":6,"description":65,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":66,"categories":67,"keywords":68,"publishedAt":19},"01M750EYD7DP60DDPQY6GK3TTR","unslop","Cut AI tells from any writing.","https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Funslop\u002FSKILL.md",[],[],{"skillNo":70,"name":71,"nameZh":6,"description":72,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":73,"categories":74,"keywords":75,"publishedAt":19},"01M750EWQG73FRRSA065D2NMRZ","typescript-best-practices","TypeScript best practices. Use when reading or editing any .ts or .tsx file.","https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Ftypescript-best-practices\u002FSKILL.md",[],[],{"skillNo":77,"name":78,"nameZh":6,"description":79,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":80,"categories":81,"keywords":82,"publishedAt":19},"01M750ETTMA3MB36DJQJ1H4QGB","thermos","Launch both thermo-nuclear review subagents in parallel, then synthesize their findings. Use for thermos, double thermo review, or combined bug\u002Fsecurity and code-quality branch audits.","https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Fthermos\u002FSKILL.md",[],[],{"skillNo":84,"name":85,"nameZh":6,"description":86,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":87,"categories":88,"keywords":89,"publishedAt":19},"01M750EQVQMQSW08KYGM7TG8K0","thermo-nuclear-review","Comprehensive security and correctness audit of a branch's changes. Use for thermo nuclear, thermonuclear, or deep review requests, or branch\u002FPR diff audits focused on bugs, breaking changes, security issues, devex regressions, and feature-gate leaks.","https:\u002F\u002Fgithub.com\u002Fmichael-denyer\u002Fpstack-claude\u002Fblob\u002Fmain\u002Fplugins\u002Fpstack\u002Fskills\u002Fthermo-nuclear-review\u002FSKILL.md",[],[]]