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 Pull Request

by trekawek in trekawek/coffee-gb

Validates a GitHub pull request, rebases away conflicts, waits for required CI on the final commit, merges with rebase and cleans up the topic branch.

MITAuto-check passedDevelopment

Install Merge Pull Request

skills CLI
$ npx skills add trekawek/coffee-gb --skill merge-pr -a claude-code

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

GitHub CLI
$ gh skill install trekawek/coffee-gb merge-pr --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/trekawek/coffee-gb.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/merge-pr .claude/skills/merge-pr && 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-pr
GitHub stars
1.2k
Token cost
~903 tokens
SKILL.md length
544 words
Files
2
Skills in repo
5
Repo updated
First seen
Licence
MIT

At a glance

Validates a GitHub pull request, rebases away conflicts, waits for required CI on the final commit, merges with rebase and cleans up the topic branch.

  • Works in 5 steps: Inspect the PR → Resolve conflicts if present → Wait for CI → …
  • Merging a specific GitHub PR once its required checks pass
  • SKILL.md covers 1. Inspect the PR, 2. Resolve conflicts if present, 3. Wait for CI and 4. Merge with the preferred…, plus 1 more section
  • Calls gh and git

What it does

Written for the Coffee GB repository, the skill needs a PR number or URL. It reads metadata, commits, diff, reviews, mergeability and check status with gh pr view and gh pr checks, and confirms the PR is open, aimed at the intended default branch, approved where required and not a draft. Unrelated working-tree changes are preserved: if the checkout is not clean, it uses a clean worktree or stops.

When there are conflicts, it rebases the PR branch onto the current base, resolves each conflict according to both sides' intent, runs tests, and pushes with --force-with-lease only to the PR head branch after confirming its remote SHA has not moved. A fork branch it cannot safely update is reported rather than changed. It waits for every required check on the final head SHA, since earlier green runs do not count, and re-reads the head SHA just before merging. The merge uses rebase with --delete-branch, falls back to a merge commit when policy requires, never squashes, never bypasses branch protection, and the merged state is confirmed before cleanup.

When your agent uses it

  • Merging a specific GitHub PR once its required checks pass
  • Rebasing a PR branch to resolve conflicts before merge
  • Making sure a PR is approved and not a draft before merging
  • Cleaning up the topic branch after a merge

Example prompts

  • “Merge the pull request from my fix-audio-sync branch once CI is green.”
  • “Rebase the PR branch onto the base branch, resolve the conflicts, rerun the tests and merge it.”
  • “Check whether this PR is approved and mergeable, and only then merge it with a rebase.”

Requirements

  • GitHub CLI (gh), authenticated
  • A clean checkout or a spare worktree

Workflow steps

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

  1. Inspect the PR
  2. Resolve conflicts if present
  3. Wait for CI
  4. Merge with the preferred method
  5. Clean up and verify

What it can do on your machine

Read from SKILL.md and the folder at commit 554ea56. 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
    • git

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

  • Network

    No URLs in SKILL.md. Its commands use gh and git, 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 Pull Request loads about 903 tokens when it runs. Until then it costs about 59 tokens; SKILL.md has 544 words of instructions outside code blocks.

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

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 trekawek/coffee-gb at commit 554ea56, republished under its MIT licence (© trekawek). 544 words, ~903 tokens.

Download SKILL.mdSave it as .claude/skills/merge-pr/SKILL.md (or your agent's skills folder). This skill also uses 1 other file; get the full folder from GitHub.
name
merge-pr
description
Validate, update, merge, and clean up a Coffee GB GitHub pull request, preferring rebase merge and falling back to a merge commit when necessary. Use when asked to merge a specific PR and wait for its required GitHub CI checks.

Merge Pull Request

Merge only after conflicts are resolved and the current required CI succeeds. Delete the merged topic branch locally and remotely when it belongs to this repository.

1. Inspect the PR

  1. Require a PR number or URL.
  2. Read the PR metadata, commits, diff, reviews, base/head repositories and branches, mergeability, and check status with gh pr view and gh pr checks.
  3. Confirm the PR is open, targets the intended default branch, has approval when required, and is not marked draft.
  4. Preserve unrelated working-tree changes. If the current checkout is not clean, use an existing clean worktree or stop rather than overwriting user work.

2. Resolve conflicts if present

If GitHub reports conflicts or the head branch is behind in a way that blocks merging:

  1. Fetch the base and PR head branches.
  2. Check out the PR branch locally.
  3. Rebase it onto the current remote base branch to preserve a linear topic history.
  4. Resolve each conflict according to both changes' intent; never accept one side wholesale without review.
  5. Run tests covering the resolved files and the PR's stated behavior.
  6. Push with --force-with-lease, never plain --force, and only to the PR head branch after confirming its remote SHA has not changed.

If the head branch is from a fork or cannot be updated safely, report the conflict and do not mutate a branch the current user does not control.

3. Wait for CI

Wait for all required GitHub checks on the final head SHA to finish. A previous green run does not count after conflict resolution or a new push.

  • Use gh pr checks <pr> --watch or equivalent polling.
  • Do not merge while any required check is queued or in progress.
  • If a required check fails, inspect its logs. Fix only failures caused by the PR and repeat the checks on the new SHA; otherwise report the blocker.
  • Re-read the PR head SHA and mergeability immediately before merging to catch concurrent updates.
Show full SKILL.md (214 more words)Show less

4. Merge with the preferred method

Attempt GitHub's Rebase and merge first:

bash
gh pr merge <pr> --rebase --delete-branch

If rebase merge is unavailable because of repository policy or the PR's commit shape, use Merge pull request:

bash
gh pr merge <pr> --merge --delete-branch

Do not use squash merge as the fallback. Do not bypass branch protection or required checks. Confirm through GitHub that the PR reached the merged state before cleanup.

5. Clean up and verify

  1. Switch the local checkout to the base branch and fast-forward it from the remote.
  2. Delete the local topic branch with git branch -d. After a rebase merge, GitHub may have rewritten every commit and safe deletion may refuse; in that case, first verify the merged PR contains the complete topic diff, then use git branch -D on that exact topic branch.
  3. Delete the remote topic branch if GitHub did not already remove it and it is in the main repository. Use an explicit branch name and do not attempt to delete a contributor's fork branch without permission.
  4. Prune remote-tracking references.
  5. Verify the PR is merged, its merge commit or rebased commits are on the base branch, the local topic branch is absent, and the owned remote topic branch is absent.

Report the PR URL, final CI result, merge method, resulting commit, and local/remote branch cleanup status.

© trekawek, 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 .agents/skills/merge-pr of trekawek/coffee-gb.

  • SKILL.md
  • agents/openai.yaml

Open the folder on GitHubat commit 554ea56

Compare with similar skills

Merge Pull Request 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 Pull Request compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Merge Pull Request this skilltrekawek/coffee-gb1.2k—~903Automated safety check: PassMIT
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0
Create Pull Request with Work Item IDmakeplane/plane61k—~824Automated safety check: PassAGPL-3.0
Creating Description For Gh PRredis/jedis12k—~838Automated safety check: PassMIT
Pascal Editor PR Openerpascalorg/editor25k—~619Automated safety check: PassMIT

Similar skills

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Create Pull Request

    cline/cline

    Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

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

  • Create Pull Request with Work Item ID

    makeplane/plane

    Opens a pull request for the current branch using the repo's template, a work item ID in the title and a description filled in from the actual diff.

    61k GitHub stars~824 tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Creating Description For Gh PR

    redis/jedis

    Official

    Generate a clear, concise GitHub PR title and description from the diff between two local git branches, and save it to prDescription.md in the repo root.

    12k GitHub stars~838 tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Pascal Editor PR Opener

    pascalorg/editor

    Opens or refreshes a pull request on pascalorg/editor from the current branch, describing only what the branch's commits and diff actually contain.

    25k GitHub stars~619 tokensUpdated today
    DevelopmentAuto-check passed

  • React Router Pull Request Creator

    remix-run/react-router

    Packages finished React Router work into a draft pull request: branch, commit, push, a written PR body and the right GitHub labels.

    57k GitHub stars~2.5k tokensUpdated yesterday
    DevelopmentAuto-check passed

More from trekawek/coffee-gb

  • Game Boy ROM Playthrough Driver

    trekawek/coffee-gb

    Plays an authorized Game Boy or Game Boy Color ROM in one persistent headless Coffee GB session, inspecting frames and keeping an action trace for replay or tests.

    1.2k GitHub stars~1.3k tokensUpdated 10 days ago
    Auto-check passed

  • Coffee GB Release

    trekawek/coffee-gb

    Releases the current Coffee GB Maven snapshot through the GitHub Maven release workflow, then verifies and curates the tag and GitHub release.

    1.2k GitHub stars~1.4k tokensUpdated 10 days ago
    Auto-check passed

  • Gitshot Image Uploader

    trekawek/coffee-gb

    Uploads screenshots and other images from the terminal and returns markdown-ready URLs to embed in GitHub pull requests, issues and comments.

    1.2k GitHub stars~855 tokensUpdated 10 days ago
    Auto-check passed

  • Coffee GB Compatibility Fix

    trekawek/coffee-gb

    Takes a Coffee GB compatibility issue from reproduction through a tested fix to an isolated pull request, with issue follow-up and screenshot evidence when possible.

    1.2k GitHub stars~1.4k tokensUpdated 10 days ago
    Auto-check passed

Works with

Categories

Questions about Merge Pull Request

What does Merge Pull Request do?

Validates a GitHub pull request, rebases away conflicts, waits for required CI on the final commit, merges with rebase and cleans up the topic branch. Written for the Coffee GB repository, the skill needs a PR number or URL. It reads metadata, commits, diff, reviews, mergeability and check status with gh pr view and gh pr checks, and confirms the PR is open, aimed at the intended default branch, approved where required and not a draft.

When should I use Merge Pull Request?

Merge Pull Request fits situations like: merging a specific GitHub PR once its required checks pass; rebasing a PR branch to resolve conflicts before merge; making sure a PR is approved and not a draft before merging; cleaning up the topic branch after a merge.

How do I install Merge Pull Request in Claude Code?

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

How do I install Merge Pull Request in Codex?

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

Can I use Merge Pull Request 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 trekawek/coffee-gb --skill merge-pr -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-pr, .gemini/skills/merge-pr, .github/skills/merge-pr and .opencode/skills/merge-pr in your project.

What does Merge Pull Request need to run?

Going by SKILL.md and its folder, Merge Pull Request needs the command-line tools its instructions call (gh and git). Our summary lists: GitHub CLI (gh), authenticated; A clean checkout or a spare worktree.

Does Merge Pull Request access the network?

SKILL.md contains no URLs. Its commands use gh and git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Merge Pull Request 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 Pull Request use?

Merge Pull Request 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 Pull Request use?

About 903 tokens (SKILL.md is roughly 3.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 Pull Request?

Skills that share tags, products or a category with Merge Pull Request: Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars), Create Pull Request (cline/cline, 70k stars), Create Pull Request with Work Item ID (makeplane/plane, 61k stars) and Creating Description For Gh PR (redis/jedis, 12k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Merge Pull Request?

trekawek (a GitHub user) maintains it in trekawek/coffee-gb, which has 1,171 GitHub stars. The repository holds 5 skills in this directory. The repository was last updated on October 1, 2026.

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