agentleFS
Sign inStart free
yokeloopyokeloop/yoke/skills/merge/SKILL.md

merge

Skill1 starsChanged 4 months agoMITView on GitHub

The user-triggered finisher that executes the post-PR tail per `.yoke/flow.md`: merges the task's PR(s), runs cascade merges, runs deploy/release commands, moves the ticket to its target state, cleans up worktrees, and returns to the default branch. Activates when the user writes "merge", "merge it", "/merge", "finish the task", "ship it", "cascade and deploy", or after the user approves a PR on GitHub. Never runs on its own — the merge decision stays the user's.

54 other projects use a version of this.

Adopted by

Most recently taken up by

Used with

Projects with it also use addskill, apply-firmware and 10 more.

Other files people use alongside this one.

Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
  • ryanportfolioSkill

    addskill

    Create, import, update, or install repo or personal skills: runtime ownership, resources, discovery checks.

    Also in 6 projects that use this

  • ryanportfolioSkill

    apply-firmware

    Bring current folder (plain folder, existing repo, old or partial firmware copy) up to full Harness Firmware in place. Mirror external repo → adopt-repo.

    Also in 6 projects that use this

  • +10 more from ryanportfolio

The file

We split this skill into the rules it gives an agent

2 rules. 0 are common, 2 are distinctive, and 0 are very specific to this project.

  • 0

    Common

    Most of the 48 edited versions we read keep these.

  • 2

    Distinctive

    This author's own choices. Worth a look.

  • 0

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  • could be automatic: a setting could enforce it
  1. Distinctive:

    Read the flow map once at the project root:

    line 33
  2. Distinctive:

    Do not restate it; do not ask "merge?" mid-run.

    line 64

“Common” is measured: kept by at least 6 in 10 of the 48 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Finish the task: merge, cascade, deploy, transition, clean up

The flow ends at PR (ADR-0006): do drives every run to a ready pull request and stops there. The merge decision is the user's, made on GitHub. /merge turns that one decision into one command — it executes the whole post-PR tail per the flow map instead of the user dictating the same paragraph every session.

Principle: merging is the user's call; /merge runs only on the explicit word.

Input

$ARGUMENTS — optional PR URL(s) or a <slug>. Empty means the current branch/worktree's task: resolve its open PR(s) via gh (e.g. gh pr view, gh pr list --head <branch>).

Procedure

Read the flow map once at the project root:

bash ${CLAUDE_PLUGIN_ROOT}/lib/flow-read.sh

Then read and follow reference/merge-procedure.md — the one reference this skill routes to for the full mechanics. It runs this step sequence, each step skipped silently when the flow map does not declare it:

  1. Merge PR(s) — merge the task's pull request(s) on GitHub.
  2. Cascade — advance the branch cascade (e.g. master → staging → develop) by each declared step command.
  3. Deploy / release — run the DEPLOY_COMMANDS the flow map declares, nothing inferred.
  4. Ticket transition — move the task's ticket to its target state.
  5. Worktree cleanup — remove the task's worktree(s) and delete merged branches.
  6. Return to the default branch — sync and land on the repo's default branch.

Rules

  • Never auto-runs. /merge fires only on an explicit user command — no automatic trigger after do, ever. The merge decision stays the user's.
  • Skip undeclared steps silently. A step whose section is absent from the flow map is skipped without nagging — omission means "apply the default", never "fail".
  • Multi-repo. Merge every one of the task's PRs; libraries were already direct-pushed by do, so there is nothing to merge for them.
  • Git authorization comes from the skill invocation itself — see "Git initiative and defaults" in ${CLAUDE_PLUGIN_ROOT}/skills/gca/reference/commit-convention.md. Do not restate it; do not ask "merge?" mid-run.
  • Artifacts only under .yoke/.
  • Any fork — an ambiguous PR set, a merge conflict, an unclear target — is one AskUserQuestion with a recommended option listed first.
  • Language: match the ticket/input language, or follow the project-level definition in CLAUDE.md / AGENTS.md.

Notify

On finish, send the terminal STAGE_COMPLETE notification with what was merged and deployed — the exact call lives in reference/merge-procedure.md §7.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free