[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7C3K9PZ2EE80VBV8KC664AY":3,"skill-same:01M7C3K9PZ2EE80VBV8KC664AY":59},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":15,"categories":16,"keywords":17,"publishedAt":18,"linkOnly":19,"markdownContent":20,"markdownBody":21,"frontMatter":22,"refName":39,"commitSha":40,"skillDirectory":41,"forksCount":13,"repositoryHtmlUrl":42,"repositoryHomepageUrl":6,"ownerHtmlUrl":43,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":44,"install":45,"resources":58},"01M7C3K9PZ2EE80VBV8KC664AY","agent-merge-conflict-arbiter",null,"Neutral arbiter for merge conflicts between two agents.","fengwhang\u002Fmercury","fengwhang","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F325040254?v=4","01M7C3K54Y41KVGPHEMKEP9X70","01M7C3K55NTZ4B36YP2JY1NMJ0",0,"MIT","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fhermes\u002Foptional-skills\u002Fautonomous-ai-agents\u002Fagent-merge-conflict-arbiter\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: agent-merge-conflict-arbiter\ndescription: \"Neutral arbiter for merge conflicts between two agents.\"\nversion: 1.0.0\nauthor: Hermes Agent\nlicense: MIT\nplatforms: [linux, macos, windows]\nmetadata:\n  mercury:\n    tags: [Multi-Agent, Git, Merge-Conflict, Kanban, Arbitration]\n    related_skills: [mercury-agent]\n---\n\n# Agent Merge-Conflict Arbiter\n\nResolve a git merge conflict between two AGENTS' branches as an impartial third\nparty. Agents resolving conflicts against a peer's work reliably either\noverwrite the peer or abandon their own change — they lack the peer's context\nand are biased toward their own side. This skill is the fix: a neutral\nreconciler that receives both diffs plus both sides' stated intents and\nproduces a merged result, like a merge-queue arbiter.\n\n## When to Use\n\n- Two agent branches\u002Fworktrees collide during a parallel campaign (kanban\n  engineering pipeline, parallel-PR wave, multi-worktree refactor).\n- `git merge` or `git rebase` halts on conflicts between two agents' work and\n  neither original agent should self-adjudicate.\n- Do NOT use for conflicts within a single agent's own work, or for trivial\n  lockfile\u002Fgenerated-file conflicts (regenerate those instead).\n\n## Prerequisites\n\n- A repo checkout containing the halted merge, or the two branch names plus\n  permission to run the merge yourself.\n- Both sides' intent sources: kanban completion summaries (`terminal` running\n  `mercury kanban show \u003Ctask-id>`), PR bodies, or at minimum each branch's\n  commit messages.\n- The project's build\u002Ftest command, if one exists.\n\n## How to Run\n\n**Standalone** — a human (or agent) invokes this skill inside the conflicted\nrepo: load the skill, then follow the Procedure top to bottom.\n\n**Spawned neutral agent** — the preferred shape in multi-agent campaigns:\n\n- `delegate_task`: spawn a subagent whose task message contains the repo path,\n  both branch names, and both sides' intent summaries verbatim, plus an\n  instruction to follow this skill.\n- Kanban-native: create a reconciliation card assigned to a **third profile**\n  (not either worker's profile) with BOTH conflicted cards linked as parents —\n  `kanban_create(title=\"reconcile branch-a x branch-b\", assignee=\"reconciler\",\n  parents=[\"t_a\", \"t_b\"])`. The parent links carry both sides' completion\n  summaries into the reconciler's context automatically; the card body should\n  name the repo path and the two branches.\n\n## Quick Reference\n\n| Hunk class | Definition | Resolution |\n|---|---|---|\n| disjoint-intent | The two changes serve different goals and can coexist | Combine both |\n| same-question-different-answer | Both sides answered one design question differently | Pick ONE per stated intents; surface the decision |\n| superseded | One side's premise no longer holds after the other's change | Keep the surviving side; note why |\n\nImpartiality contract: never favor the side that spawned you; touch ONLY\nconflicted regions (no drive-by edits); every design-question pick must appear\nexplicitly in the hand-back summary.\n\n## Procedure\n\n### 1. Gather both sides\n\n- Run via `terminal`: `git status` (confirm the conflicted state and list\n  conflicted files), `git merge-base \u003CA> \u003CB>`, then for each side\n  `git log --oneline \u003Cbase>..\u003Cside>` and `git diff \u003Cbase>..\u003Cside> -- \u003Cfile>`\n  for every conflicted file. In a halted merge, `HEAD` is one side and\n  `MERGE_HEAD` is the other.\n- Collect each side's intent: `mercury kanban show \u003Ctask-id>` for completion\n  summaries\u002Fmetadata, or the PR body, or the commit messages from the log\n  above. Write down one sentence of intent per side before touching any file.\n- Done when: you can state both intents in your own words and have both diffs\n  for every conflicted file.\n\n### 2. Classify every conflicted hunk\n\n- Open each conflicted file with `read_file` and locate each\n  `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`\u002F`=======`\u002F`>>>>>>>` block.\n- Assign each hunk exactly one class from the Quick Reference table, judging\n  by the stated intents — not by which change looks nicer.\n- If a single hunk contains multiple independent decisions (e.g., new logic\n  that combines cleanly PLUS a styling\u002Frounding choice both sides answered\n  differently), decompose it into sub-decisions and classify each one.\n- A single file often mixes classes: one hunk may be a design collision while\n  a neighboring hunk is disjoint. Classify per hunk, not per file.\n- Done when: every hunk has a written class and a one-line rationale.\n\n### 3. Resolve under the impartiality contract\n\n- Edit each hunk with `patch` (or `write_file` for whole-file rewrites):\n  - disjoint-intent → merge both changes so each intent is fully served.\n  - same-question-different-answer → pick the answer that best serves the\n    STATED intents (e.g., an intent of \"strict validation\" beats \"quick\n    default\" if the task required correctness). Never split the difference\n    into a hybrid neither side asked for.\n  - superseded → keep the surviving side; delete the dead premise.\n- Never favor the side that spawned you. If intents genuinely tie, escalate\n  (block the kanban card \u002F report back) rather than guess.\n- Change nothing outside conflict markers — no formatting, renames, or\n  opportunistic fixes.\n- `git add` each resolved file via `terminal`.\n- Done when: `search_files` finds no `\u003C\u003C\u003C\u003C\u003C\u003C\u003C` markers in the repo and every\n  resolved file is staged.\n\n### 4. Verify\n\n- Run the project's build\u002Ftests via `terminal`; at minimum import\u002Fexecute the\n  touched modules. Both intents must be observable in the merged behavior\n  (e.g., side A's new semantics AND side B's disjoint addition both present).\n- Complete the merge: `git commit` (the default merge message plus a body\n  listing hunk decisions is fine).\n- Done when: verification passes and the merge commit exists.\n\n### 5. Hand back\n\n- Produce a completion summary naming EVERY hunk decision:\n  `file:lines — class — which side(s) kept — rationale`. For every\n  same-question-different-answer hunk, state the design question and the\n  answer you picked so a human can veto it — never bury a design call.\n- Kanban: `kanban_complete(summary=...)`. Standalone: print the summary.\n- Done when: the summary is delivered and lists all hunks.\n\n## Pitfalls\n\n- **Self-favoring**: if you were spawned by one of the conflicting agents,\n  you are structurally biased — state this and weigh the other side's intent\n  deliberately. Prefer the third-profile shape so this never arises.\n- **Splitting the difference** on a design collision produces a hybrid nobody\n  designed; pick one answer and surface it.\n- **Per-file classification**: files usually mix hunk classes; classifying a\n  whole file as one class silently drops a disjoint change.\n- **Drive-by edits** make the merge unreviewable and steal decisions from the\n  original agents.\n- **Missing intents**: commit messages alone can be thin; prefer kanban\n  completion summaries or PR bodies. If neither side's intent is recoverable,\n  escalate instead of guessing.\n- **Repeat offenders**: repeated conflicts on the SAME file across rounds are\n  a hotspot signal, not routine reconciliation work — flag it (e.g. a\n  `hotspot: \u003Cpath> — \u003Creason>` kanban comment) so the orchestrator decomposes\n  that file, rather than serially reconciling every new collision on it.\n\n## Verification\n\n- `git status` shows a clean tree on the target branch with a merge commit.\n- No conflict markers remain (`search_files` pattern `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`).\n- Build\u002Ftests pass; both sides' intents are demonstrably present or the\n  dropped one is explicitly named in the summary.\n- The hand-back summary enumerates every hunk with class and rationale.\n","# Agent Merge-Conflict Arbiter\n\nResolve a git merge conflict between two AGENTS' branches as an impartial third\nparty. Agents resolving conflicts against a peer's work reliably either\noverwrite the peer or abandon their own change — they lack the peer's context\nand are biased toward their own side. This skill is the fix: a neutral\nreconciler that receives both diffs plus both sides' stated intents and\nproduces a merged result, like a merge-queue arbiter.\n\n## When to Use\n\n- Two agent branches\u002Fworktrees collide during a parallel campaign (kanban\n  engineering pipeline, parallel-PR wave, multi-worktree refactor).\n- `git merge` or `git rebase` halts on conflicts between two agents' work and\n  neither original agent should self-adjudicate.\n- Do NOT use for conflicts within a single agent's own work, or for trivial\n  lockfile\u002Fgenerated-file conflicts (regenerate those instead).\n\n## Prerequisites\n\n- A repo checkout containing the halted merge, or the two branch names plus\n  permission to run the merge yourself.\n- Both sides' intent sources: kanban completion summaries (`terminal` running\n  `mercury kanban show \u003Ctask-id>`), PR bodies, or at minimum each branch's\n  commit messages.\n- The project's build\u002Ftest command, if one exists.\n\n## How to Run\n\n**Standalone** — a human (or agent) invokes this skill inside the conflicted\nrepo: load the skill, then follow the Procedure top to bottom.\n\n**Spawned neutral agent** — the preferred shape in multi-agent campaigns:\n\n- `delegate_task`: spawn a subagent whose task message contains the repo path,\n  both branch names, and both sides' intent summaries verbatim, plus an\n  instruction to follow this skill.\n- Kanban-native: create a reconciliation card assigned to a **third profile**\n  (not either worker's profile) with BOTH conflicted cards linked as parents —\n  `kanban_create(title=\"reconcile branch-a x branch-b\", assignee=\"reconciler\",\n  parents=[\"t_a\", \"t_b\"])`. The parent links carry both sides' completion\n  summaries into the reconciler's context automatically; the card body should\n  name the repo path and the two branches.\n\n## Quick Reference\n\n| Hunk class | Definition | Resolution |\n|---|---|---|\n| disjoint-intent | The two changes serve different goals and can coexist | Combine both |\n| same-question-different-answer | Both sides answered one design question differently | Pick ONE per stated intents; surface the decision |\n| superseded | One side's premise no longer holds after the other's change | Keep the surviving side; note why |\n\nImpartiality contract: never favor the side that spawned you; touch ONLY\nconflicted regions (no drive-by edits); every design-question pick must appear\nexplicitly in the hand-back summary.\n\n## Procedure\n\n### 1. Gather both sides\n\n- Run via `terminal`: `git status` (confirm the conflicted state and list\n  conflicted files), `git merge-base \u003CA> \u003CB>`, then for each side\n  `git log --oneline \u003Cbase>..\u003Cside>` and `git diff \u003Cbase>..\u003Cside> -- \u003Cfile>`\n  for every conflicted file. In a halted merge, `HEAD` is one side and\n  `MERGE_HEAD` is the other.\n- Collect each side's intent: `mercury kanban show \u003Ctask-id>` for completion\n  summaries\u002Fmetadata, or the PR body, or the commit messages from the log\n  above. Write down one sentence of intent per side before touching any file.\n- Done when: you can state both intents in your own words and have both diffs\n  for every conflicted file.\n\n### 2. Classify every conflicted hunk\n\n- Open each conflicted file with `read_file` and locate each\n  `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`\u002F`=======`\u002F`>>>>>>>` block.\n- Assign each hunk exactly one class from the Quick Reference table, judging\n  by the stated intents — not by which change looks nicer.\n- If a single hunk contains multiple independent decisions (e.g., new logic\n  that combines cleanly PLUS a styling\u002Frounding choice both sides answered\n  differently), decompose it into sub-decisions and classify each one.\n- A single file often mixes classes: one hunk may be a design collision while\n  a neighboring hunk is disjoint. Classify per hunk, not per file.\n- Done when: every hunk has a written class and a one-line rationale.\n\n### 3. Resolve under the impartiality contract\n\n- Edit each hunk with `patch` (or `write_file` for whole-file rewrites):\n  - disjoint-intent → merge both changes so each intent is fully served.\n  - same-question-different-answer → pick the answer that best serves the\n    STATED intents (e.g., an intent of \"strict validation\" beats \"quick\n    default\" if the task required correctness). Never split the difference\n    into a hybrid neither side asked for.\n  - superseded → keep the surviving side; delete the dead premise.\n- Never favor the side that spawned you. If intents genuinely tie, escalate\n  (block the kanban card \u002F report back) rather than guess.\n- Change nothing outside conflict markers — no formatting, renames, or\n  opportunistic fixes.\n- `git add` each resolved file via `terminal`.\n- Done when: `search_files` finds no `\u003C\u003C\u003C\u003C\u003C\u003C\u003C` markers in the repo and every\n  resolved file is staged.\n\n### 4. Verify\n\n- Run the project's build\u002Ftests via `terminal`; at minimum import\u002Fexecute the\n  touched modules. Both intents must be observable in the merged behavior\n  (e.g., side A's new semantics AND side B's disjoint addition both present).\n- Complete the merge: `git commit` (the default merge message plus a body\n  listing hunk decisions is fine).\n- Done when: verification passes and the merge commit exists.\n\n### 5. Hand back\n\n- Produce a completion summary naming EVERY hunk decision:\n  `file:lines — class — which side(s) kept — rationale`. For every\n  same-question-different-answer hunk, state the design question and the\n  answer you picked so a human can veto it — never bury a design call.\n- Kanban: `kanban_complete(summary=...)`. Standalone: print the summary.\n- Done when: the summary is delivered and lists all hunks.\n\n## Pitfalls\n\n- **Self-favoring**: if you were spawned by one of the conflicting agents,\n  you are structurally biased — state this and weigh the other side's intent\n  deliberately. Prefer the third-profile shape so this never arises.\n- **Splitting the difference** on a design collision produces a hybrid nobody\n  designed; pick one answer and surface it.\n- **Per-file classification**: files usually mix hunk classes; classifying a\n  whole file as one class silently drops a disjoint change.\n- **Drive-by edits** make the merge unreviewable and steal decisions from the\n  original agents.\n- **Missing intents**: commit messages alone can be thin; prefer kanban\n  completion summaries or PR bodies. If neither side's intent is recoverable,\n  escalate instead of guessing.\n- **Repeat offenders**: repeated conflicts on the SAME file across rounds are\n  a hotspot signal, not routine reconciliation work — flag it (e.g. a\n  `hotspot: \u003Cpath> — \u003Creason>` kanban comment) so the orchestrator decomposes\n  that file, rather than serially reconciling every new collision on it.\n\n## Verification\n\n- `git status` shows a clean tree on the target branch with a merge commit.\n- No conflict markers remain (`search_files` pattern `\u003C\u003C\u003C\u003C\u003C\u003C\u003C`).\n- Build\u002Ftests pass; both sides' intents are demonstrably present or the\n  dropped one is explicitly named in the summary.\n- The hand-back summary enumerates every hunk with class and rationale.\n",{"name":5,"author":23,"license":14,"version":24,"metadata":25,"platforms":35,"description":7},"Hermes Agent","1.0.0",{"mercury":26},{"tags":27,"related_skills":33},[28,29,30,31,32],"Multi-Agent","Git","Merge-Conflict","Kanban","Arbitration",[34],"mercury-agent",[36,37,38],"linux","macos","windows","main","94a12cab2ce32e2020d179b5d579d0cbcbd0f206","hermes\u002Foptional-skills\u002Fautonomous-ai-agents\u002Fagent-merge-conflict-arbiter","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury","https:\u002F\u002Fgithub.com\u002Ffengwhang","2026-10-09 08:26:42",{"source":8,"skillName":5,"commands":46,"prompt":56,"zipAvailable":57},[47,50,53],{"tool":48,"command":49},"npx","npx skills add fengwhang\u002Fmercury --skill agent-merge-conflict-arbiter",{"tool":51,"command":52},"bunx","bunx skills add fengwhang\u002Fmercury --skill agent-merge-conflict-arbiter",{"tool":54,"command":55},"pnpm","pnpm dlx skills add fengwhang\u002Fmercury --skill agent-merge-conflict-arbiter","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fhermes\u002Foptional-skills\u002Fautonomous-ai-agents\u002Fagent-merge-conflict-arbiter\u002FSKILL.md",true,[],[60,67,74,81,87,94],{"skillNo":61,"name":62,"nameZh":6,"description":63,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":64,"categories":65,"keywords":66,"publishedAt":18},"01M7C4BTY3ND38CN200ZCTH6NV","greet","A greeting skill for testing","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fomp\u002Fpackages\u002Fcoding-agent\u002Ftest\u002Fmarketplace\u002Ffixtures\u002Fvalid-marketplace\u002Fplugins\u002Fhello-plugin\u002Fskills\u002Fgreet\u002FSKILL.md",[],[],{"skillNo":68,"name":69,"nameZh":6,"description":70,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":71,"categories":72,"keywords":73,"publishedAt":18},"01M7C4BSNZTPW8JR5NGCQXGSEZ","valid-skill","A valid skill for testing purposes.","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fomp\u002Fpackages\u002Fcoding-agent\u002Ftest\u002Ffixtures\u002Fskills\u002Fvalid-skill\u002FSKILL.md",[],[],{"skillNo":75,"name":76,"nameZh":6,"description":77,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":18},"01M7C4BRA7J8C06KSVW100F1W1","unknown-field","A skill with an unknown frontmatter field.","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fomp\u002Fpackages\u002Fcoding-agent\u002Ftest\u002Ffixtures\u002Fskills\u002Funknown-field\u002FSKILL.md",[],[],{"skillNo":82,"name":83,"nameZh":6,"description":6,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":84,"categories":85,"keywords":86,"publishedAt":18},"01M7C4BNB04KQGCJ835JE8AR13","no-frontmatter","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fomp\u002Fpackages\u002Fcoding-agent\u002Ftest\u002Ffixtures\u002Fskills\u002Fno-frontmatter\u002FSKILL.md",[],[],{"skillNo":88,"name":89,"nameZh":6,"description":90,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":91,"categories":92,"keywords":93,"publishedAt":18},"01M7C4BM38TZFYT1AJ6SKHPZZ2","child-skill","A nested skill in a subdirectory.","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fomp\u002Fpackages\u002Fcoding-agent\u002Ftest\u002Ffixtures\u002Fskills\u002Fnested\u002Fchild-skill\u002FSKILL.md",[],[],{"skillNo":95,"name":96,"nameZh":6,"description":97,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":98,"categories":99,"keywords":100,"publishedAt":18},"01M7C4BJDN7RFFCM28CGX15Q97","different-name","A skill with a name that doesn't match the directory.","https:\u002F\u002Fgithub.com\u002Ffengwhang\u002Fmercury\u002Fblob\u002Fmain\u002Fomp\u002Fpackages\u002Fcoding-agent\u002Ftest\u002Ffixtures\u002Fskills\u002Fname-mismatch\u002FSKILL.md",[],[]]