New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Merge

by automagik-dev in automagik-dev/genie

Resolve an in-progress merge or rebase by the intent of both sides, re-run the full gate on the merged tree, and finish the operation.

MITAuto-check passedDevelopment

Install Merge

skills CLI
$ npx skills add automagik-dev/genie --skill merge -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install automagik-dev/genie merge --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/automagik-dev/genie.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/merge .claude/skills/merge && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
merge
GitHub stars
346
Token cost
~996 tokens
SKILL.md length
548 words
Files
2
Skills in repo
19
Repo updated
First seen
Licence
MIT

At a glance

Resolve an in-progress merge or rebase by the intent of both sides, re-run the full gate on the merged tree, and finish the operation.

  • Development work in your project
  • SKILL.md covers See the state, Find the intent, Resolve each hunk and Re-run the gate, plus 2 more sections
  • Calls git, bun and npm

What it does

Merge is an agent skill from automagik-dev/genie. Resolve an in-progress merge or rebase by the intent of both sides, re-run the full gate on the merged tree, and finish the operation.

Its SKILL.md is about 1000 tokens, which your agent loads only when the skill is triggered. The skill folder holds 2 other files (for example `agents/openai.yaml`).

It sits in Development. The repository describes itself as: Wishes in, PRs out. CLI agent that interviews you, plans the work, dispatches parallel agents in isolated worktrees, and reviews code before you see it. The licence is MIT.

When your agent uses it

  • Development work in your project

Example prompts

  • “/merge”

What it can do on your machine

Read from SKILL.md and the folder at commit b6be3e7. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • bun
    • npm
    • make

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    Links to these hosts (documentation or services it may open):

    • github.com

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Merge loads about 996 tokens when it runs. Until then it costs about 35 tokens; SKILL.md has 548 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~35
When it runs · the whole SKILL.md, loaded when a task matches
~996

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from automagik-dev/genie at commit b6be3e7, republished under its MIT licence (© automagik-dev). 548 words, ~996 tokens.

Download SKILL.mdSave it as .claude/skills/merge/SKILL.md (or your agent's skills folder). This skill also uses 1 other file; get the full folder from GitHub.
name
merge
description
Resolve an in-progress merge or rebase by the intent of both sides, re-run the full gate on the merged tree, and finish the operation.
category
delivery
mutates
repo

Merge

A conflict is two intents meeting, not two texts disagreeing. Resolve it by understanding what each side was for. Always resolve; abandoning the operation returns the same conflict to the next person with less context than you have now.

See the state

Establish what is actually in progress before touching a file:

bash
git status
git log --oneline --left-right --boundary HEAD...MERGE_HEAD
mapfile -t conflicted < <(git diff --name-only --diff-filter=U)
printf '%s\n' "${conflicted[@]}"

Record that list while the paths are still conflicted: once the markers are gone the same query returns nothing, and this is the list you stage at the end.

A rebase and a merge present the sides in opposite orders, so confirm which operation you are in before reading any hunk. During a rebase the side labelled as yours is the upstream branch, and the side labelled as theirs is the commit being replayed.

Find the intent

For each conflicting file, find the primary source of both changes:

bash
git log -p --follow -- <path>

Read the commit messages, and where a commit points at a pull request or an issue, read that too. The wish that owns the work is the strongest source available in this repository: the criteria and the execution strategy say what the change was for in the author's own words. Keep reading until you can state each side's intent in one sentence.

Resolve each hunk

  • Preserve both intents where they compose. Most conflicts are two independent edits that a mechanical tool could not interleave.
  • Where they genuinely cannot compose, keep the one matching the stated goal of this merge and note the trade-off in your report.
  • Never resolve by taking one side wholesale. Choosing a side without reading the hunk discards the other intent silently, which is exactly the failure a conflict exists to prevent.
  • Never invent behaviour neither side asked for. A conflict is not an opportunity to refactor.
  • Delete every conflict marker, then read the merged region as though it arrived as a fresh diff. It has to make sense on its own.
Show full SKILL.md (240 more words)Show less

Re-run the gate

The merged tree is code neither side ever compiled. Run the repository's own full gate on it: the full aggregate check the repository defines, the one its CI enforces, not a hook's faster subset. That is bun run check in genie, and often npm run check or make check elsewhere. Find it in the repository's root scripts or task file and confirm it against what CI runs, rather than assuming one or taking a hook's command.

That gate is the only proof the merge is sound. A green gate on either parent proves nothing about the merge. Fix what the merge broke, and re-run until it exits zero; a partial re-run proves only the part you re-ran.

Finish

Stage the paths you recorded as conflicted, nothing else, and complete the operation:

bash
git add -- "${conflicted[@]}"
git commit -m 'chore: merge <source> into <target>'
git rebase --continue   # when rebasing, until every commit is replayed

The subject uses a conventional-commit type. There is no merge type in the accepted set, so a subject beginning with that word alone is rejected by the commit hook; chore is the type that carries an integration commit.

A rebase surfaces its conflicts one commit at a time, so run the gate again after the last commit replays, not only after the first resolution.

Report

Name each conflicting file, the intent you preserved on each side, every trade-off you took where the two could not compose, and the gate result on the merged tree with its exit status.

<!-- adapted from https://github.com/mattpocock/skills/tree/main/skills/resolving-merge-conflicts (MIT, commit cddededbbb2ed38f0e0b26b46be8455c59d78ab1 via gongyijie85/mattpocock-skills-dsh) -->

© automagik-dev, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

SKILL.md and 1 other file in skills/merge of automagik-dev/genie.

  • SKILL.md
  • agents/openai.yaml

Open the folder on GitHubat commit b6be3e7

Compare with similar skills

Merge next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Merge compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Merge this skillautomagik-dev/genie346—~996Automated safety check: PassMIT
Trellis Session Insightmindfold-ai/Trellis15k4 repos~1.7kAutomated safety check: PassAGPL-3.0
Openspec Verify ChangeFission-AI/OpenSpec71k2 repos~4.6kAutomated safety check: PassMIT
Warp Factory Fileswarpdotdev/warp65k1 repos~2.5kAutomated safety check: PassAGPL-3.0
Migrate Core Code to Submodulestinyhumansai/openhuman42k—~2.6kAutomated safety check: PassGPL-3.0
Analyze Logsactivepieces/activepieces25k1 repos~1.6kAutomated safety check: PassMIT

Similar skills

  • Trellis Session Insight

    mindfold-ai/Trellis

    Reach into past AI conversation history through the trellis mem CLI.

    15k GitHub starsUsed in 4 repos~1.7k tokens
    DevelopmentAuto-check passed

  • Openspec Verify Change

    Fission-AI/OpenSpec

    Verify implementation matches OpenSpec change artifacts. An agent skill from Fission-AI/OpenSpec.

    71k GitHub starsUsed in 2 repos~4.6k tokens
    DevelopmentAuto-check passed

  • Warp Factory Files

    warpdotdev/warp

    Authors and edits file-based Warp software factory definitions rooted at factory.yaml, covering agents, automations, scorers and webhooks, and validates them before a pull request.

    65k GitHub starsUsed in 1 repo~2.5k tokens
    DevelopmentAuto-check passed

  • Migrate Core Code to Submodules

    tinyhumansai/openhuman

    Plans and carries out moving non-host-specific code and its tests from the OpenHuman core into vendored tiny submodule libraries, then releases the submodule and re-pins the host.

    42k GitHub stars~2.6k tokensUpdated today
    DevelopmentAuto-check passed

  • Analyze Logs

    activepieces/activepieces

    Analyze application logs from the .evlog/logs/ directory. An agent skill from activepieces/activepieces.

    25k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • GitHub Review Iteration

    prisma/orm

    Official

    Runs a loop on a GitHub pull request: fetch review state, triage comments into actions, implement them and resolve threads, repeating until nothing actionable is left.

    48k GitHub stars~2.2k tokensUpdated today
    DevelopmentAuto-check passed

More from automagik-dev/genie

All 19 skills in this repo

  • Learn

    automagik-dev/genie

    Diagnose and fix agent behavioral surfaces when the user corrects a mistake — connects to Claude native memory.

    346 GitHub stars~720 tokensUpdated yesterday
    Auto-check passed

  • Brainstorm

    automagik-dev/genie

    Explore an ambiguous idea with the user, settle scope and success criteria, and produce an independently reviewed design for wish.

    346 GitHub stars~2k tokensUpdated yesterday
    Auto-check passed

  • Report

    automagik-dev/genie

    Investigate a failure to its root cause with grounded evidence, hand the diagnosis to fix, and create a GitHub issue only when asked.

    346 GitHub stars~2k tokensUpdated yesterday
    Auto-check passed

  • Wish

    automagik-dev/genie

    Deliver one decided task end to end — admit it, work it in one worktree, gate, independent review, bounded repair, a merge-ready PR — or plan a multi-group wish when it is bigger than one task.

    346 GitHub stars~3.7k tokensUpdated yesterday
    Auto-check passed

  • Work

    automagik-dev/genie

    Execute an approved wish in dependency order with scoped workers, independent review, bounded repairs, and verified completion.

    346 GitHub stars~2.5k tokensUpdated yesterday
    Auto-check passed

  • Authoring

    automagik-dev/genie

    Write or revise a Genie skill so it survives the shipped contract — frontmatter, house size, starter card, and runtime-neutral voice.

    346 GitHub stars~1k tokensUpdated yesterday
    Auto-check passed

Categories

Questions about Merge

What does Merge do?

Resolve an in-progress merge or rebase by the intent of both sides, re-run the full gate on the merged tree, and finish the operation. Merge is an agent skill from automagik-dev/genie. Resolve an in-progress merge or rebase by the intent of both sides, re-run the full gate on the merged tree, and finish the operation.

When should I use Merge?

Merge fits situations like: development work in your project.

How do I install Merge in Claude Code?

Run `npx skills add automagik-dev/genie --skill merge -a claude-code`. Or copy the skill folder (skills/merge in automagik-dev/genie) into .claude/skills/merge in your project. Claude Code loads it when a task matches its description.

How do I install Merge in Codex?

Run `npx skills add automagik-dev/genie --skill merge -a codex`. Or copy the skill folder (skills/merge in automagik-dev/genie) into .agents/skills/merge in your project. Codex loads it when a task matches its description.

Can I use Merge in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add automagik-dev/genie --skill merge -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/merge, .gemini/skills/merge, .github/skills/merge and .opencode/skills/merge in your project.

What does Merge need to run?

Going by SKILL.md and its folder, Merge needs the command-line tools its instructions call (git, bun, npm and make).

Does Merge access the network?

SKILL.md names 1 domain. As links in the text: github.com. This is read from the text; nothing was executed.

Is Merge safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Merge use?

Merge is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Merge use?

About 996 tokens (SKILL.md is roughly 4k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Merge?

Skills that share tags, products or a category with Merge: Trellis Session Insight (mindfold-ai/Trellis, 15k stars), Openspec Verify Change (Fission-AI/OpenSpec, 71k stars), Warp Factory Files (warpdotdev/warp, 65k stars) and Migrate Core Code to Submodules (tinyhumansai/openhuman, 42k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Merge?

automagik-dev (a GitHub organization) maintains it in automagik-dev/genie, which has 346 GitHub stars. The repository holds 19 skills in this directory. The repository was last updated on October 8, 2026.

Source: automagik-dev/genie on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.