[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7F65M96GV2DP25FQ1MG2JK6":3,"skill-same:01M7F65M96GV2DP25FQ1MG2JK6":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":19,"linkOnly":20,"markdownContent":21,"markdownBody":22,"frontMatter":23,"refName":40,"commitSha":41,"skillDirectory":42,"forksCount":14,"repositoryHtmlUrl":43,"repositoryHomepageUrl":6,"ownerHtmlUrl":44,"ownerBlogUrl":45,"ownerDescription":46,"updatedAt":47,"install":48,"resources":61},"01M7F65M96GV2DP25FQ1MG2JK6","merge-reconciler",null,"Neutral third-party resolution of agent merge conflicts.","chaorenex1\u002Fhermes-home-content","chaorenex1","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F23194925?v=4","01M7F5NA1D1D02R2MEMYQN2NZT","chan chan","01M7F5NA20KTHMTY2015CYM1TZ",0,"MIT","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Fautonomous-ai-agents\u002Fmerge-reconciler\u002FSKILL.md",[],[],"2026-11-16 10:05:34",false,"---\r\nname: merge-reconciler\r\ndescription: \"Neutral third-party resolution of agent merge conflicts.\"\r\nversion: 1.0.0\r\nauthor: Hermes Agent\r\nlicense: MIT\r\nplatforms: [linux, macos, windows]\r\nmetadata:\r\n  hermes:\r\n    tags: [Multi-Agent, Git, Merge-Conflict, Kanban, Arbitration]\r\n    related_skills: [hermes-agent]\r\n---\r\n\r\n# Merge Reconciler\r\n\r\nResolve a git merge conflict between two AGENTS' branches as an impartial third\r\nparty. Agents resolving conflicts against a peer's work reliably either\r\noverwrite the peer or abandon their own change — they lack the peer's context\r\nand are biased toward their own side. This skill is the fix: a neutral\r\nreconciler that receives both diffs plus both sides' stated intents and\r\nproduces a merged result, like a merge-queue arbiter.\r\n\r\n## When to Use\r\n\r\n- Two agent branches\u002Fworktrees collide during a parallel campaign (kanban\r\n  engineering pipeline, parallel-PR wave, multi-worktree refactor).\r\n- `git merge` or `git rebase` halts on conflicts between two agents' work and\r\n  neither original agent should self-adjudicate.\r\n- Do NOT use for conflicts within a single agent's own work, or for trivial\r\n  lockfile\u002Fgenerated-file conflicts (regenerate those instead).\r\n\r\n## Prerequisites\r\n\r\n- A repo checkout containing the halted merge, or the two branch names plus\r\n  permission to run the merge yourself.\r\n- Both sides' intent sources: kanban completion summaries (`terminal` running\r\n  `hermes kanban show \u003Ctask-id>`), PR bodies, or at minimum each branch's\r\n  commit messages.\r\n- The project's build\u002Ftest command, if one exists.\r\n\r\n## How to Run\r\n\r\n**Standalone** — a human (or agent) invokes this skill inside the conflicted\r\nrepo: load the skill, then follow the Procedure top to bottom.\r\n\r\n**Spawned neutral agent** — the preferred shape in multi-agent campaigns:\r\n\r\n- `delegate_task`: spawn a subagent whose task message contains the repo path,\r\n  both branch names, and both sides' intent summaries verbatim, plus an\r\n  instruction to follow this skill.\r\n- Kanban-native: create a reconciliation card assigned to a **third profile**\r\n  (not either worker's profile) with BOTH conflicted cards linked as parents —\r\n  `kanban_create(title=\"reconcile branch-a x branch-b\", assignee=\"reconciler\",\r\n  parents=[\"t_a\", \"t_b\"])`. The parent links carry both sides' completion\r\n  summaries into the reconciler's context automatically; the card body should\r\n  name the repo path and the two branches.\r\n\r\n## Quick Reference\r\n\r\n| Hunk class | Definition | Resolution |\r\n|---|---|---|\r\n| disjoint-intent | The two changes serve different goals and can coexist | Combine both |\r\n| same-question-different-answer | Both sides answered one design question differently | Pick ONE per stated intents; surface the decision |\r\n| superseded | One side's premise no longer holds after the other's change | Keep the surviving side; note why |\r\n\r\nImpartiality contract: never favor the side that spawned you; touch ONLY\r\nconflicted regions (no drive-by edits); every design-question pick must appear\r\nexplicitly in the hand-back summary.\r\n\r\n## Procedure\r\n\r\n### 1. Gather both sides\r\n\r\n- Run via `terminal`: `git status` (confirm the conflicted state and list\r\n  conflicted files), `git merge-base \u003CA> \u003CB>`, then for each side\r\n  `git log --oneline \u003Cbase>..\u003Cside>` and `git diff \u003Cbase>..\u003Cside> -- \u003Cfile>`\r\n  for every conflicted file. In a halted merge, `HEAD` is one side and\r\n  `MERGE_HEAD` is the other.\r\n- Collect each side's intent: `hermes kanban show \u003Ctask-id>` for completion\r\n  summaries\u002Fmetadata, or the PR body, or the commit messages from the log\r\n  above. Write down one sentence of intent per side before touching any file.\r\n- Done when: you can state both intents in your own words and have both diffs\r\n  for every conflicted file.\r\n\r\n### 2. Classify every conflicted hunk\r\n\r\n- Open each conflicted file with `read_file` and locate each\r\n  `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`\u002F`=======`\u002F`>>>>>>>` block.\r\n- Assign each hunk exactly one class from the Quick Reference table, judging\r\n  by the stated intents — not by which change looks nicer.\r\n- If a single hunk contains multiple independent decisions (e.g., new logic\r\n  that combines cleanly PLUS a styling\u002Frounding choice both sides answered\r\n  differently), decompose it into sub-decisions and classify each one.\r\n- A single file often mixes classes: one hunk may be a design collision while\r\n  a neighboring hunk is disjoint. Classify per hunk, not per file.\r\n- Done when: every hunk has a written class and a one-line rationale.\r\n\r\n### 3. Resolve under the impartiality contract\r\n\r\n- Edit each hunk with `patch` (or `write_file` for whole-file rewrites):\r\n  - disjoint-intent → merge both changes so each intent is fully served.\r\n  - same-question-different-answer → pick the answer that best serves the\r\n    STATED intents (e.g., an intent of \"strict validation\" beats \"quick\r\n    default\" if the task required correctness). Never split the difference\r\n    into a hybrid neither side asked for.\r\n  - superseded → keep the surviving side; delete the dead premise.\r\n- Never favor the side that spawned you. If intents genuinely tie, escalate\r\n  (block the kanban card \u002F report back) rather than guess.\r\n- Change nothing outside conflict markers — no formatting, renames, or\r\n  opportunistic fixes.\r\n- `git add` each resolved file via `terminal`.\r\n- Done when: `search_files` finds no `\u003C\u003C\u003C\u003C\u003C\u003C\u003C` markers in the repo and every\r\n  resolved file is staged.\r\n\r\n### 4. Verify\r\n\r\n- Run the project's build\u002Ftests via `terminal`; at minimum import\u002Fexecute the\r\n  touched modules. Both intents must be observable in the merged behavior\r\n  (e.g., side A's new semantics AND side B's disjoint addition both present).\r\n- Complete the merge: `git commit` (the default merge message plus a body\r\n  listing hunk decisions is fine).\r\n- Done when: verification passes and the merge commit exists.\r\n\r\n### 5. Hand back\r\n\r\n- Produce a completion summary naming EVERY hunk decision:\r\n  `file:lines — class — which side(s) kept — rationale`. For every\r\n  same-question-different-answer hunk, state the design question and the\r\n  answer you picked so a human can veto it — never bury a design call.\r\n- Kanban: `kanban_complete(summary=...)`. Standalone: print the summary.\r\n- Done when: the summary is delivered and lists all hunks.\r\n\r\n## Pitfalls\r\n\r\n- **Self-favoring**: if you were spawned by one of the conflicting agents,\r\n  you are structurally biased — state this and weigh the other side's intent\r\n  deliberately. Prefer the third-profile shape so this never arises.\r\n- **Splitting the difference** on a design collision produces a hybrid nobody\r\n  designed; pick one answer and surface it.\r\n- **Per-file classification**: files usually mix hunk classes; classifying a\r\n  whole file as one class silently drops a disjoint change.\r\n- **Drive-by edits** make the merge unreviewable and steal decisions from the\r\n  original agents.\r\n- **Missing intents**: commit messages alone can be thin; prefer kanban\r\n  completion summaries or PR bodies. If neither side's intent is recoverable,\r\n  escalate instead of guessing.\r\n- **Repeat offenders**: repeated conflicts on the SAME file across rounds are\r\n  a hotspot signal, not routine reconciliation work — flag it (e.g. a\r\n  `hotspot: \u003Cpath> — \u003Creason>` kanban comment) so the orchestrator decomposes\r\n  that file, rather than serially reconciling every new collision on it.\r\n\r\n## Verification\r\n\r\n- `git status` shows a clean tree on the target branch with a merge commit.\r\n- No conflict markers remain (`search_files` pattern `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`).\r\n- Build\u002Ftests pass; both sides' intents are demonstrably present or the\r\n  dropped one is explicitly named in the summary.\r\n- The hand-back summary enumerates every hunk with class and rationale.\r\n","# Merge Reconciler\r\n\r\nResolve a git merge conflict between two AGENTS' branches as an impartial third\r\nparty. Agents resolving conflicts against a peer's work reliably either\r\noverwrite the peer or abandon their own change — they lack the peer's context\r\nand are biased toward their own side. This skill is the fix: a neutral\r\nreconciler that receives both diffs plus both sides' stated intents and\r\nproduces a merged result, like a merge-queue arbiter.\r\n\r\n## When to Use\r\n\r\n- Two agent branches\u002Fworktrees collide during a parallel campaign (kanban\r\n  engineering pipeline, parallel-PR wave, multi-worktree refactor).\r\n- `git merge` or `git rebase` halts on conflicts between two agents' work and\r\n  neither original agent should self-adjudicate.\r\n- Do NOT use for conflicts within a single agent's own work, or for trivial\r\n  lockfile\u002Fgenerated-file conflicts (regenerate those instead).\r\n\r\n## Prerequisites\r\n\r\n- A repo checkout containing the halted merge, or the two branch names plus\r\n  permission to run the merge yourself.\r\n- Both sides' intent sources: kanban completion summaries (`terminal` running\r\n  `hermes kanban show \u003Ctask-id>`), PR bodies, or at minimum each branch's\r\n  commit messages.\r\n- The project's build\u002Ftest command, if one exists.\r\n\r\n## How to Run\r\n\r\n**Standalone** — a human (or agent) invokes this skill inside the conflicted\r\nrepo: load the skill, then follow the Procedure top to bottom.\r\n\r\n**Spawned neutral agent** — the preferred shape in multi-agent campaigns:\r\n\r\n- `delegate_task`: spawn a subagent whose task message contains the repo path,\r\n  both branch names, and both sides' intent summaries verbatim, plus an\r\n  instruction to follow this skill.\r\n- Kanban-native: create a reconciliation card assigned to a **third profile**\r\n  (not either worker's profile) with BOTH conflicted cards linked as parents —\r\n  `kanban_create(title=\"reconcile branch-a x branch-b\", assignee=\"reconciler\",\r\n  parents=[\"t_a\", \"t_b\"])`. The parent links carry both sides' completion\r\n  summaries into the reconciler's context automatically; the card body should\r\n  name the repo path and the two branches.\r\n\r\n## Quick Reference\r\n\r\n| Hunk class | Definition | Resolution |\r\n|---|---|---|\r\n| disjoint-intent | The two changes serve different goals and can coexist | Combine both |\r\n| same-question-different-answer | Both sides answered one design question differently | Pick ONE per stated intents; surface the decision |\r\n| superseded | One side's premise no longer holds after the other's change | Keep the surviving side; note why |\r\n\r\nImpartiality contract: never favor the side that spawned you; touch ONLY\r\nconflicted regions (no drive-by edits); every design-question pick must appear\r\nexplicitly in the hand-back summary.\r\n\r\n## Procedure\r\n\r\n### 1. Gather both sides\r\n\r\n- Run via `terminal`: `git status` (confirm the conflicted state and list\r\n  conflicted files), `git merge-base \u003CA> \u003CB>`, then for each side\r\n  `git log --oneline \u003Cbase>..\u003Cside>` and `git diff \u003Cbase>..\u003Cside> -- \u003Cfile>`\r\n  for every conflicted file. In a halted merge, `HEAD` is one side and\r\n  `MERGE_HEAD` is the other.\r\n- Collect each side's intent: `hermes kanban show \u003Ctask-id>` for completion\r\n  summaries\u002Fmetadata, or the PR body, or the commit messages from the log\r\n  above. Write down one sentence of intent per side before touching any file.\r\n- Done when: you can state both intents in your own words and have both diffs\r\n  for every conflicted file.\r\n\r\n### 2. Classify every conflicted hunk\r\n\r\n- Open each conflicted file with `read_file` and locate each\r\n  `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`\u002F`=======`\u002F`>>>>>>>` block.\r\n- Assign each hunk exactly one class from the Quick Reference table, judging\r\n  by the stated intents — not by which change looks nicer.\r\n- If a single hunk contains multiple independent decisions (e.g., new logic\r\n  that combines cleanly PLUS a styling\u002Frounding choice both sides answered\r\n  differently), decompose it into sub-decisions and classify each one.\r\n- A single file often mixes classes: one hunk may be a design collision while\r\n  a neighboring hunk is disjoint. Classify per hunk, not per file.\r\n- Done when: every hunk has a written class and a one-line rationale.\r\n\r\n### 3. Resolve under the impartiality contract\r\n\r\n- Edit each hunk with `patch` (or `write_file` for whole-file rewrites):\r\n  - disjoint-intent → merge both changes so each intent is fully served.\r\n  - same-question-different-answer → pick the answer that best serves the\r\n    STATED intents (e.g., an intent of \"strict validation\" beats \"quick\r\n    default\" if the task required correctness). Never split the difference\r\n    into a hybrid neither side asked for.\r\n  - superseded → keep the surviving side; delete the dead premise.\r\n- Never favor the side that spawned you. If intents genuinely tie, escalate\r\n  (block the kanban card \u002F report back) rather than guess.\r\n- Change nothing outside conflict markers — no formatting, renames, or\r\n  opportunistic fixes.\r\n- `git add` each resolved file via `terminal`.\r\n- Done when: `search_files` finds no `\u003C\u003C\u003C\u003C\u003C\u003C\u003C` markers in the repo and every\r\n  resolved file is staged.\r\n\r\n### 4. Verify\r\n\r\n- Run the project's build\u002Ftests via `terminal`; at minimum import\u002Fexecute the\r\n  touched modules. Both intents must be observable in the merged behavior\r\n  (e.g., side A's new semantics AND side B's disjoint addition both present).\r\n- Complete the merge: `git commit` (the default merge message plus a body\r\n  listing hunk decisions is fine).\r\n- Done when: verification passes and the merge commit exists.\r\n\r\n### 5. Hand back\r\n\r\n- Produce a completion summary naming EVERY hunk decision:\r\n  `file:lines — class — which side(s) kept — rationale`. For every\r\n  same-question-different-answer hunk, state the design question and the\r\n  answer you picked so a human can veto it — never bury a design call.\r\n- Kanban: `kanban_complete(summary=...)`. Standalone: print the summary.\r\n- Done when: the summary is delivered and lists all hunks.\r\n\r\n## Pitfalls\r\n\r\n- **Self-favoring**: if you were spawned by one of the conflicting agents,\r\n  you are structurally biased — state this and weigh the other side's intent\r\n  deliberately. Prefer the third-profile shape so this never arises.\r\n- **Splitting the difference** on a design collision produces a hybrid nobody\r\n  designed; pick one answer and surface it.\r\n- **Per-file classification**: files usually mix hunk classes; classifying a\r\n  whole file as one class silently drops a disjoint change.\r\n- **Drive-by edits** make the merge unreviewable and steal decisions from the\r\n  original agents.\r\n- **Missing intents**: commit messages alone can be thin; prefer kanban\r\n  completion summaries or PR bodies. If neither side's intent is recoverable,\r\n  escalate instead of guessing.\r\n- **Repeat offenders**: repeated conflicts on the SAME file across rounds are\r\n  a hotspot signal, not routine reconciliation work — flag it (e.g. a\r\n  `hotspot: \u003Cpath> — \u003Creason>` kanban comment) so the orchestrator decomposes\r\n  that file, rather than serially reconciling every new collision on it.\r\n\r\n## Verification\r\n\r\n- `git status` shows a clean tree on the target branch with a merge commit.\r\n- No conflict markers remain (`search_files` pattern `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`).\r\n- Build\u002Ftests pass; both sides' intents are demonstrably present or the\r\n  dropped one is explicitly named in the summary.\r\n- The hand-back summary enumerates every hunk with class and rationale.\r\n",{"name":5,"author":24,"license":15,"version":25,"metadata":26,"platforms":36,"description":7},"Hermes Agent","1.0.0",{"hermes":27},{"tags":28,"related_skills":34},[29,30,31,32,33],"Multi-Agent","Git","Merge-Conflict","Kanban","Arbitration",[35],"hermes-agent",[37,38,39],"linux","macos","windows","main","a3f3199bb87ec3c91248f68a39d88527e1847ae9","skills\u002Fautonomous-ai-agents\u002Fmerge-reconciler","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content","https:\u002F\u002Fgithub.com\u002Fchaorenex1","https:\u002F\u002Fblog.aduib.com","A programmer whose only hobby in life is coding","2026-10-20 00:34:32",{"source":8,"skillName":5,"commands":49,"prompt":59,"zipAvailable":60},[50,53,56],{"tool":51,"command":52},"npx","npx skills add chaorenex1\u002Fhermes-home-content --skill merge-reconciler",{"tool":54,"command":55},"bunx","bunx skills add chaorenex1\u002Fhermes-home-content --skill merge-reconciler",{"tool":57,"command":58},"pnpm","pnpm dlx skills add chaorenex1\u002Fhermes-home-content --skill merge-reconciler","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Fautonomous-ai-agents\u002Fmerge-reconciler\u002FSKILL.md",true,[],[63,70,77,84,91,98],{"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":15,"licenseFileUrl":6,"sourceHtmlUrl":67,"categories":68,"keywords":69,"publishedAt":19},"01M7F8GF32YD5MBQW2TGSRH1YP","web-retrieval-resilience","Web tools fail or search rules break: repair or fall back.","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Fweb\u002Fweb-retrieval-resilience\u002FSKILL.md",[],[],{"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":19},"01M7F8FP46QESQMCZ1KBT3TW3R","blocked-page-recovery","Use when a fetch fails: 403\u002F429, paywall, WAF, bot wall.","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Fweb\u002Fblocked-page-recovery\u002FSKILL.md",[],[],{"skillNo":78,"name":79,"nameZh":6,"description":80,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":81,"categories":82,"keywords":83,"publishedAt":19},"01M7F8ER6VXHBNVRQBZS7X08SE","verification-loop","Run a six-phase verification of a Claude Code session's work — build, type check, lint, tests with coverage, security grep, and diff review — then produce a PASS\u002FFAIL verification report. Use when verifying work after completing a feature or refactor, before creating a PR, or when quality gates must pass.","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Fverification-loop\u002FSKILL.md",[],[],{"skillNo":85,"name":86,"nameZh":6,"description":87,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":88,"categories":89,"keywords":90,"publishedAt":19},"01M7F8E4BQJ38KVQVM3MT20PYV","unreal-world-builder","开放世界与环境专家——精通 UE5 World Partition、Landscape、程序化植被、HLOD 和大规模关卡流式加载，打造无缝开放世界体验","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Funreal-engine\u002Funreal-world-builder\u002FSKILL.md",[],[],{"skillNo":92,"name":93,"nameZh":6,"description":94,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":95,"categories":96,"keywords":97,"publishedAt":19},"01M7F8D747SQW2FTP7GBSX38BR","unreal-technical-artist","Unreal Engine 视觉管线专家——精通材质编辑器、Niagara 特效、程序化内容生成和 UE5 项目的美术到引擎管线","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Funreal-engine\u002Funreal-technical-artist\u002FSKILL.md",[],[],{"skillNo":99,"name":100,"nameZh":6,"description":101,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":102,"categories":103,"keywords":104,"publishedAt":19},"01M7F8CKHYJVZVBTN0321J88T2","unreal-systems-engineer","性能与混合架构专家——精通 C++\u002FBlueprint 边界、Nanite 几何体、Lumen GI 和 Gameplay Ability System，面向 AAA 级 Unreal Engine 项目","https:\u002F\u002Fgithub.com\u002Fchaorenex1\u002Fhermes-home-content\u002Fblob\u002Fmain\u002Fskills\u002Funreal-engine\u002Funreal-systems-engineer\u002FSKILL.md",[],[]]