Every premium and members-only resource for $9.99/month, as a no-commitment subscription. See the plans

PalateKit

Sign in
Menu

Request a resource

Describe the resource you are missing in one sentence. We will email you when it is published.

0 / 280

A page, a video or an image online.

Unlock PalateKit

Unlock everything

Plan

Paying means accepting our terms of sale.

Secure payment by Stripe. Receipts and invoices sent by email.

Welcome back

Sign in to install, download or save this resource. A free account is enough for free resources.

Arbitrate a merge conflict between two agents v1.0.0

Use this resource to resolve a merge conflict between two agent branches without favouring either

New

  • 412 downloads
  • 148 likes
  • 205 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install impartial-merge-conflict-resolution

With no option, the skill goes to ~/.agents/skills/; add --agent claude-code (or codex, cursor…) to target an agent.

First time: connect the CLI with

npx --yes palatekit@latest login

The agent gathers both diffs and each side's intent, classifies each conflicting hunk, then produces a merge that keeps both changes. It verifies the result before handing it back.

Mostly picked by

Updated November 2, 2026

Card for the “Arbitrate a merge conflict between two agents” skill

Details

Works in
Install guides
Generates with
Your agent's model
Licence
MIT

Similar resources

View all

What you get

  • SKILL.md: gathering both sides and classifying the hunks
  • SKILL.md: impartiality rules, verification and hand-back

Good fit for

  • Two parallel worktrees change the same module
  • A multi-branch campaign keeps producing conflicts

Not for

    Tags

    • merge conflict
    • git
    • agents
    • worktree
    • arbitration

    About

    You say

    “Resolve the conflict between the billing agent's branch and the API agent's, keeping both intents.”

    Card for the “Arbitrate a merge conflict between two agents” skill

    Skill published by Hermes Agent under the MIT license, delivered in its original version.

    Show more

    How to use it

    1. Install the skill in your agent's skills folder
    2. Ask your agent to resolve a merge conflict between two agent branches without favouring either
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE1 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • SKILL.md7.5 KB

    Origin and licence

    Listed unmodified

    Author
    Hermes Agent
    Source
    github.com/nousresearch/hermes-agent/tree/0c74cc682dc81bf78b78a1737b3ee77a820ccb79/optional-skills/autonomous-ai-agents/agent-merge-conflict-arbiter
    Licence
    MIT

    Notice

    « agent-merge-conflict-arbiter » (Hermes Agent, MIT) livré dans sa version d'origine : fiche en français et en anglais par PalateKit.

    User reviews

    –

    No ratings yet

    Loading reviews…

    Delete your review?

    Your rating and comment will be removed from the page.