agentleFS
dannotedannote/dot-pi/skills/vibe-merge/SKILL.md

vibe-merge

Skill57 starsChanged 5 months agoMITView on GitHub

Use when the user wants to "vibe-merge"/"vibe-marge" a PR or branch: independently reimplement good ideas, avoid blind merging/cherry-picking, preserve quality, and credit the contributor as co-author.

The file

Show its rules and text

We split this skill into the rules it gives an agent

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

  • ≈0

    Common · estimate

    Many files like this have a rule of this kind.

  • ≈20

    Distinctive · estimate

    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 PR/branch metadata, diff, commits, discussion, requested changes, external reviews, and checks.

    line 13
  2. Distinctive:

    If the email is private/unusable, use the GitHub noreply identity from the PR author when available.

    line 16
  3. Distinctive:

    Write down the useful ideas and the risky parts separately.

    line 17
  4. Distinctive:

    Start from the target base branch, not from the PR branch.

    line 20
  5. Distinctive:

    Prefer smaller commits over a broad mixed rewrite.

    line 22
  6. Distinctive:

    Do not copy large code blocks blindly.

    line 23
  7. Distinctive:

    Keep unrelated PR churn out of the commit.

    line 24
  8. Distinctive:

    Run focused tests for the touched area.

    line 27
  9. Distinctive:

    Run the repo's normal check command before finalizing if feasible.

    line 28
  10. Distinctive:

    If the PR idea has known review findings, fix them during the reimplementation instead of importing the bug.

    line 29
  11. Distinctive:

    Every commit that incorporates a contributor's idea must include a trailer:

    line 32
  12. Distinctive:

    If multiple contributors materially influenced the idea, include multiple trailers.

    line 38
  13. Distinctive:

    Do not claim sole authorship for ideas mined from external PRs.

    line 39
  14. Distinctive:

    When closing or commenting on the original PR, thank the contributor and explain briefly that selected ideas landed with co-author credit.

    line 46
  15. Distinctive:

    Use the repository's normal commit style.

    line 50
  16. Distinctive:

    Do not squash many unrelated ideas into one commit.

    line 63
  17. Distinctive:

    Do not preserve a PR's bugs just to stay close to the source.

    line 64
  18. Distinctive:

    Do not omit attribution because the implementation was rewritten.

    line 65
  19. Distinctive:

    Do not force-push protected/shared branches unless explicitly requested.

    line 66
  20. Distinctive:

    If the contributor has an open PR, avoid making comments that sound dismissive.

    line 67

≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “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

Vibe Merge

Vibe-merge means: mine a PR/branch for good ideas, implement the worthwhile parts ourselves in small reviewable commits, and credit the original contributor with Co-authored-by trailers. Do not merge the branch wholesale unless the user explicitly asks.

Workflow

  1. Inspect the source
    • Read the PR/branch metadata, diff, commits, discussion, requested changes, external reviews, and checks.
    • Identify the original author name/email from commits when possible:
      • git show -s --format='%an <%ae>' <commit>
      • If the email is private/unusable, use the GitHub noreply identity from the PR author when available.
    • Write down the useful ideas and the risky parts separately.
  2. Pick one idea at a time
    • Start from the target base branch, not from the PR branch.
    • Implement the idea in the project's style and architecture.
    • Prefer smaller commits over a broad mixed rewrite.
    • Do not copy large code blocks blindly; adapt or reimplement to fit current abstractions.
    • Keep unrelated PR churn out of the commit.
  3. Validate each idea
    • Run focused tests for the touched area.
    • Run the repo's normal check command before finalizing if feasible.
    • If the PR idea has known review findings, fix them during the reimplementation instead of importing the bug.
  4. Credit the contributor
    • Every commit that incorporates a contributor's idea must include a trailer:

      Co-authored-by: Contributor Name <email@example.com>
    • If multiple contributors materially influenced the idea, include multiple trailers.
    • Do not claim sole authorship for ideas mined from external PRs.
  5. Communicate clearly
    • Say which PR/branch the idea came from.
    • Mention that it was reimplemented rather than merged directly.
    • Draft any reply after reading the full conversation; do not repeat context the contributor already knows or expose private reasoning.
    • Show the exact reply and wait for approval before posting.
    • When closing or commenting on the original PR, thank the contributor and explain briefly that selected ideas landed with co-author credit.

Commit shape

Use the repository's normal commit style. Keep the body useful and include the co-author trailer at the end:

perf(canvas): cache retained scene backing

- Rebuild backing surfaces incrementally during viewport movement
- Fall back to direct rendering if CanvasKit cannot allocate an offscreen surface

Co-authored-by: Joey Cumines <123456+joeycumines@users.noreply.github.com>

Guardrails

  • Do not squash many unrelated ideas into one commit.
  • Do not preserve a PR's bugs just to stay close to the source.
  • Do not omit attribution because the implementation was rewritten.
  • Do not force-push protected/shared branches unless explicitly requested.
  • If the contributor has an open PR, avoid making comments that sound dismissive; frame it as incorporating their good ideas safely.

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.