[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6MM16F1K1DGSX6D4PXRGZ5A":3,"skill-same:01M6MM16F1K1DGSX6D4PXRGZ5A":62},{"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":32,"linkOnly":33,"markdownContent":34,"markdownBody":35,"frontMatter":36,"refName":39,"commitSha":40,"skillDirectory":41,"forksCount":42,"repositoryHtmlUrl":43,"repositoryHomepageUrl":44,"ownerHtmlUrl":45,"ownerBlogUrl":46,"ownerDescription":47,"updatedAt":48,"install":49,"resources":61},"01M6MM16F1K1DGSX6D4PXRGZ5A","resolve-merge",null,"Use when a merge or rebase has conflicts, including plans and chronicles with colliding names.","hashgraph-online\u002Fawesome-codex-plugins","hashgraph-online","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F160371962?v=4","01M6CNB6NRJVNNGN14TR01Q6D3","HOL (Hashgraph Online)","01M6JT1HSKKG9V68KQAQGBA7XP",1575,"Apache-2.0","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Freidemeister94\u002Fdevelopment-skills\u002Fskills\u002Fresolve-merge\u002FSKILL.md",[],[19,20,21,22,23,24,25,26,27,28,29,30,31],"merge","resolve merge","conflict","true","plans","Bash","with","active","read","write","edit","grep","rebase","2026-11-10 10:12:30",false,"---\nname: resolve-merge\ndescription: \"Use when a merge or rebase has conflicts, including plans and chronicles with colliding names.\"\nuser-invocable: true\nallowed-tools: Glob, Grep, Read, Bash, Edit, Write, AskUserQuestion\n---\n\n# Resolve Merge Conflicts\n\n1. Verify `MERGE_HEAD` or `REBASE_HEAD`; otherwise stop with `No merge in progress.`\n2. Before any write, list conflicts and classify each as AUTO or JUDGMENT.\n3. AUTO requires mechanical proof; default to JUDGMENT. AUTO cases:\n   - Sides byte-identical (`git show :2:\u003Cf>` vs `:3:\u003Cf>`) or differing only in whitespace\u002FEOL → take either.\n   - AU → `git add`, but `git rm` if its slug already exists in theirs under another name (duplicate).\n   - Lock file → checkout one side, regenerate via the package manager.\n   - `CHANGELOG.md` → merge unique entries, dedupe, keep category order.\n4. When an OURS-only `NNNN__` plan or chronicle collides with a THEIRS number, keep THEIRS. Rename the OURS file to `YYYY-MM-DD__\u003Cslug>.md` with its own date and slug, and never give it a new number. Repair its paired record, research, and cross-references. When date names collide, reconcile the same task or give different tasks distinct slugs.\n5. Show every conflict with file, code, action, and classification. Ask once: Approve \u002F Modify \u002F Abort. Abort writes nothing.\n6. Apply approved AUTO actions; report only counts and failures.\n7. For each JUDGMENT file, show exact OURS and THEIRS hunks plus the proposed merge. Ask Approve \u002F Edit \u002F Skip; Skip leaves it conflicted.\n8. A file failure stays conflicted and goes under `Skipped`; continue with others.\n9. Verify no tracked conflict markers, valid file names and references when relevant, and known build\u002Flint checks.\n10. Report `N resolved: X AUTO, Y JUDGMENT; Skipped: …`, then hand off to `\u002Fcommit` without committing. Stop on failed checks.\n\nOn Codex, translate gates with [codex-tools.md](..\u002Fusing-development-skills\u002Freferences\u002Fcodex-tools.md).\n","# Resolve Merge Conflicts\n\n1. Verify `MERGE_HEAD` or `REBASE_HEAD`; otherwise stop with `No merge in progress.`\n2. Before any write, list conflicts and classify each as AUTO or JUDGMENT.\n3. AUTO requires mechanical proof; default to JUDGMENT. AUTO cases:\n   - Sides byte-identical (`git show :2:\u003Cf>` vs `:3:\u003Cf>`) or differing only in whitespace\u002FEOL → take either.\n   - AU → `git add`, but `git rm` if its slug already exists in theirs under another name (duplicate).\n   - Lock file → checkout one side, regenerate via the package manager.\n   - `CHANGELOG.md` → merge unique entries, dedupe, keep category order.\n4. When an OURS-only `NNNN__` plan or chronicle collides with a THEIRS number, keep THEIRS. Rename the OURS file to `YYYY-MM-DD__\u003Cslug>.md` with its own date and slug, and never give it a new number. Repair its paired record, research, and cross-references. When date names collide, reconcile the same task or give different tasks distinct slugs.\n5. Show every conflict with file, code, action, and classification. Ask once: Approve \u002F Modify \u002F Abort. Abort writes nothing.\n6. Apply approved AUTO actions; report only counts and failures.\n7. For each JUDGMENT file, show exact OURS and THEIRS hunks plus the proposed merge. Ask Approve \u002F Edit \u002F Skip; Skip leaves it conflicted.\n8. A file failure stays conflicted and goes under `Skipped`; continue with others.\n9. Verify no tracked conflict markers, valid file names and references when relevant, and known build\u002Flint checks.\n10. Report `N resolved: X AUTO, Y JUDGMENT; Skipped: …`, then hand off to `\u002Fcommit` without committing. Stop on failed checks.\n\nOn Codex, translate gates with [codex-tools.md](..\u002Fusing-development-skills\u002Freferences\u002Fcodex-tools.md).\n",{"name":5,"description":7,"allowed-tools":37,"user-invocable":38},"Glob, Grep, Read, Bash, Edit, Write, AskUserQuestion",true,"main","2a6d24be2ed571c5ff2319c506b60741bbcb1cb0","plugins\u002Freidemeister94\u002Fdevelopment-skills\u002Fskills\u002Fresolve-merge",491,"https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins","https:\u002F\u002Fhol.org\u002Fplugins\u002Fbest-codex-plugins","https:\u002F\u002Fgithub.com\u002Fhashgraph-online","https:\u002F\u002Fhol.org","Open-source standards and developer tools for interoperable AI agents: discovery, identity, communication, payments, privacy and security.","2026-11-14 14:06:13",{"source":8,"skillName":5,"commands":50,"prompt":60,"zipAvailable":38},[51,54,57],{"tool":52,"command":53},"npx","npx skills add hashgraph-online\u002Fawesome-codex-plugins --skill resolve-merge",{"tool":55,"command":56},"bunx","bunx skills add hashgraph-online\u002Fawesome-codex-plugins --skill resolve-merge",{"tool":58,"command":59},"pnpm","pnpm dlx skills add hashgraph-online\u002Fawesome-codex-plugins --skill resolve-merge","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Freidemeister94\u002Fdevelopment-skills\u002Fskills\u002Fresolve-merge\u002FSKILL.md",[],[63,73,81,89,97,105],{"skillNo":64,"name":65,"nameZh":6,"description":66,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":67,"licenseFileUrl":68,"sourceHtmlUrl":69,"categories":70,"keywords":71,"publishedAt":72},"01M7DV332YQMGD8WTRJ9DZQXTB","worktable-review-with-annotations","Create, inspect, reply to, update, or resolve situated Worktable annotations. Use when feedback belongs to a Doc section, block, text range, or HTML Doc, or when the user asks to address existing review feedback and coordinate a requested artifact edit.","MIT","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-review-with-annotations\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-review-with-annotations\u002FSKILL.md",[],[],"2026-11-15 14:19:17",{"skillNo":74,"name":75,"nameZh":6,"description":76,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":67,"licenseFileUrl":77,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":72},"01M7DV2YGHCZVBEB1AHYB6CGHE","worktable-find-and-synthesize-context","Find, assess, and synthesize context from Worktable Docs and Records. Use when the user asks what a workspace contains, wants workspace-backed research, needs current facts reconciled across artifacts, or requests a cited synthesis without changing workspace state.","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-find-and-synthesize-context\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-find-and-synthesize-context\u002FSKILL.md",[],[],{"skillNo":82,"name":83,"nameZh":6,"description":84,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":67,"licenseFileUrl":85,"sourceHtmlUrl":86,"categories":87,"keywords":88,"publishedAt":72},"01M7DV2TQN1H11ME2SAF9MXN7V","worktable-create-or-update-docs","Create, edit, rename, or maintain narrative Worktable Docs. Use for plans, decisions, briefs, notes, research syntheses, and other durable prose when the user requests a new artifact or a safe update to an existing one.","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-create-or-update-docs\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-create-or-update-docs\u002FSKILL.md",[],[],{"skillNo":90,"name":91,"nameZh":6,"description":92,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":67,"licenseFileUrl":93,"sourceHtmlUrl":94,"categories":95,"keywords":96,"publishedAt":72},"01M7DV2NE452NEA8TXATKSNAJH","worktable-create-or-manage-records","Organize repeated structured information as durable Worktable Records. Use for research datasets, inventories, directories, pipelines, trackers, and other collections whose items need identity, fields, filtering, links, validation, or individual updates.","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-create-or-manage-records\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-create-or-manage-records\u002FSKILL.md",[],[],{"skillNo":98,"name":99,"nameZh":6,"description":100,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":67,"licenseFileUrl":101,"sourceHtmlUrl":102,"categories":103,"keywords":104,"publishedAt":72},"01M7DV2HENRBR2KSCVM064WH0Y","worktable-create-or-manage-interactive-html","Create or improve durable visual and interactive artifacts in Worktable. Use for dashboards, trackers, calculators, mini apps, slide presentations, and other requests that benefit from a polished HTML Doc.","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-create-or-manage-interactive-html\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-create-or-manage-interactive-html\u002FSKILL.md",[],[],{"skillNo":106,"name":107,"nameZh":6,"description":108,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":67,"licenseFileUrl":109,"sourceHtmlUrl":110,"categories":111,"keywords":112,"publishedAt":72},"01M7DV2CADR5R7RQFFYPNAGR9Y","worktable-collaborate-threads","Read, answer, and hand off messages through durable Worktable threads with users or other authenticated participants. Use when the user asks to check addressed messages, reply to a participant, continue a thread, request another agent's help, wait briefly for a response, or watch for comments and messages sent to the agent.","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-collaborate-threads\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Fhashgraph-online\u002Fawesome-codex-plugins\u002Fblob\u002Fmain\u002Fplugins\u002Fworktable\u002Fworktable-plugin\u002Fskills\u002Fworktable-collaborate-threads\u002FSKILL.md",[],[]]