Agent skill

Merge

by jtenniswood in jtenniswood/espcontrol

Prepare and merge a specific EspControl pull request by addressing remaining review feedback, resolving conflicts with main, and merging only when required reviews and checks are clear.

Custom licenceAuto-check passedDevelopment

Install Merge

skills CLI
$ npx skills add jtenniswood/espcontrol --skill merge -a claude-code

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

GitHub CLI
$ gh skill install jtenniswood/espcontrol 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/jtenniswood/espcontrol.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/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
1.1k
Token cost
~1.4k tokens
SKILL.md length
811 words
Files
2
Skills in repo
14
Repo updated
First seen
Licence
Custom licence

At a glance

Prepare and merge a specific EspControl pull request by addressing remaining review feedback, resolving conflicts with main, and merging only when required reviews and checks are clear.

  • Works in 5 steps: Identify One Pull Request → Clear Review Feedback → Update the Branch and Resolve Conflicts → …
  • The user says /merge
  • SKILL.md covers Goal, Workflow and Final Update
  • Calls gh

What it does

Merge is an agent skill from jtenniswood/espcontrol. Prepare and merge a specific EspControl pull request by addressing remaining review feedback, resolving conflicts with main, and merging only when required reviews and checks are clear. Use when the user says "/merge" or asks to get a pull request ready and merge it.

Its SKILL.md is about 1.4k 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, covering Pull requests. The repository describes itself as: Esphome based smart home control panel.

When your agent uses it

  • The user says /merge
  • Asks to get a pull request ready and merge it

Example prompts

  • “/merge”
  • “/merge”

Workflow steps

5 steps, taken from the step headings in SKILL.md.

  1. Identify One Pull Request
  2. Clear Review Feedback
  3. Update the Branch and Resolve Conflicts
  4. Recheck Merge Readiness
  5. Merge

What it can do on your machine

Read from SKILL.md and the folder at commit 24ce042. 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:

    • gh

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

  • Network

    No URLs in SKILL.md. Its commands use gh, which can reach the network depending on how they are called.

    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 1.4k tokens when it runs. Until then it costs about 68 tokens; SKILL.md has 811 words of instructions outside code blocks.

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

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

Its licence (Custom licence) doesn't allow us to republish the file, so here is its outline and opening line. It has 811 words (~1,388 tokens).

“Take one identified pull request through the repository's final review and conflict-resolution workflows, then merge it when GitHub reports that it is ready. Invoking this skill authorizes the merge attempt for that pull request; it does not authorize bypassing protections…”

— opening of SKILL.md by jtenniswood, Custom licence
name
merge

Read the full SKILL.md on GitHub

Files

SKILL.md and 1 other file in .agents/skills/merge of jtenniswood/espcontrol.

  • SKILL.md
  • agents/openai.yaml

Open the folder on GitHubat commit 24ce042

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 skilljtenniswood/espcontrol1.1k—~1.4kAutomated safety check: PassCustom licence
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
PR Babysitteropeninterpreter/openinterpreter69k3 repos~4.2kAutomated safety check: PassApache-2.0
Check PRonyx-dot-app/onyx32k2 repos~2.3kAutomated safety check: PassMIT
PR Design DocOpenHands/OpenHands91k—~2.4kAutomated safety check: PassMIT
WooCommerce Code Reviewwoocommerce/woocommerce11k3 repos~1.1kAutomated safety check: PassCustom licence

Similar skills

  • Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed
  • PR Babysitter

    openinterpreter/openinterpreter

    Watches an open GitHub pull request until it merges, handling review comments, diagnosing CI failures and retrying flaky checks along the way.

    69k GitHub starsUsed in 3 repos~4.2k tokens
    DevelopmentAuto-check passed
  • Check PR

    onyx-dot-app/onyx

    Checks a GitHub, GitLab, or Perforce (p4) pull request (or merge request, or shelved changelist) for unresolved review comments, failing status checks, and incomplete PR descriptions.

    32k GitHub starsUsed in 2 repos~2.3k tokens
    DevelopmentAuto-check passed
  • PR Design Doc

    OpenHands/OpenHands

    For a non-trivial pull request, write a self-contained HTML design doc under the temporary .pr/ directory and link a visibility-appropriate preview in the PR description, so maintainers grasp the…

    91k GitHub stars~2.4k tokensUpdated today
    DevelopmentAuto-check passed
  • WooCommerce Code Review

    woocommerce/woocommerce

    Reviews WooCommerce code changes against the project's standards, flagging backend PHP architecture, naming, documentation, data integrity and testing violations.

    11k GitHub starsUsed in 3 repos~1.1k tokens
    DevelopmentAuto-check passed
  • Record PR Demo

    payloadcms/payload

    A skill your agent uses when a Payload pull request needs a concise visual walkthrough for reviewers.

    45k GitHub stars~1k tokensUpdated yesterday
    DevelopmentAuto-check passed

More from jtenniswood/espcontrol

All 14 skills in this repo
  • Clean Complete Branches

    jtenniswood/espcontrol

    Clean up completed Git branches and worktrees for this repository both locally and on GitHub.

    1.1k GitHub stars~820 tokensUpdated today
    Auto-check passed
  • Clean Merged Branch Folders

    jtenniswood/espcontrol

    Clean up local branch worktree folders for this repository after their branches or pull requests have merged to main.

    1.1k GitHub stars~813 tokensUpdated today
    Auto-check passed
  • Flash Displays

    jtenniswood/espcontrol

    Flash EspControl display firmware from this repository using ESPHome.

    1.1k GitHub stars~2.8k tokensUpdated today
    Auto-check passed
  • PR

    jtenniswood/espcontrol

    Review a new or open pull request for this repository with an adversarial security and quality lens.

    1.1k GitHub stars~1.4k tokensUpdated today
    Auto-check passed
  • Release

    jtenniswood/espcontrol

    Create and safely publish a new GitHub release for this repository through a verified draft build, then confirm the related GitHub Actions run.

    1.1k GitHub stars~1.7k tokensUpdated today
    Auto-check passed
  • Review All

    jtenniswood/espcontrol

    Review every open pull request authored by the user in this repository and address actionable unresolved review feedback.

    1.1k GitHub stars~1.5k tokensUpdated today
    Auto-check passed

Categories

Questions about Merge

What does Merge do?

Prepare and merge a specific EspControl pull request by addressing remaining review feedback, resolving conflicts with main, and merging only when required reviews and checks are clear. Merge is an agent skill from jtenniswood/espcontrol. Prepare and merge a specific EspControl pull request by addressing remaining review feedback, resolving conflicts with main, and merging only when required reviews and checks are clear.

When should I use Merge?

Merge fits situations like: the user says /merge; asks to get a pull request ready and merge it.

How do I install Merge in Claude Code?

Run `npx skills add jtenniswood/espcontrol --skill merge -a claude-code`. Or copy the skill folder (.agents/skills/merge in jtenniswood/espcontrol) 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 jtenniswood/espcontrol --skill merge -a codex`. Or copy the skill folder (.agents/skills/merge in jtenniswood/espcontrol) 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 jtenniswood/espcontrol --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 (gh).

Does Merge access the network?

SKILL.md contains no URLs. Its commands use gh, which can reach the network depending on how they are called. 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 has a licence file (the repository's licence) that doesn't match a standard licence. Read it on GitHub before reusing the skill.

How many tokens does Merge use?

About 1.4k tokens (SKILL.md is roughly 5.6k 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: Finishing a Development Branch (obra/superpowers, 297k stars), PR Babysitter (openinterpreter/openinterpreter, 69k stars), Check PR (onyx-dot-app/onyx, 32k stars) and PR Design Doc (OpenHands/OpenHands, 91k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Merge?

jtenniswood (a GitHub user) maintains it in jtenniswood/espcontrol, which has 1,091 GitHub stars. The repository holds 14 skills in this directory. The repository was last updated on October 9, 2026.

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