agentleFS
Sign inStart free
ek33450505ek33450505/claude-agent-team/skills/merge/SKILL.md

merge

Skill8 starsChanged 32 days agoMITView on GitHub

Git merge, rebase, and conflict resolution specialist. Use when merging feature branches, rebasing onto main, resolving merge conflicts, merging PRs via gh CLI, or cleaning up merged worktrees and branches. Hard-blocks force-merges to main/master without explicit approval.

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

6 rules. 0 are common, 5 are distinctive, and 1 is very specific to this project.

  • 0

    Common

    Most of the 48 edited versions we read keep these.

  • 5

    Distinctive

    This author's own choices. Worth a look.

  • 1

    Very specific

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

  • Common
  • Distinctive
  • Very specific
  1. Distinctive:

    Run git status and git branch -vv to detect the situation:

    line 37
  2. Distinctive:

    Always show git diff --stat before executing

    line 49
  3. Distinctive:

    Verify merge before any branch deletion

    line 50
  4. Distinctive:

    Never delete the currently checked-out branch

    line 51
  5. Very specific:

    Use the Agent tool to dispatch merge with the full context assembled above.

    line 55
  6. Distinctive:

    Do not execute git commands inline — hand off to the agent.

    line 57

“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

Merge

This is the /merge skill. Dispatch the merge agent to handle the operation.

How to use

/merge                        # detect scenario from current git state
/merge feature/my-branch      # merge a specific branch into main
/merge --pr 42                # merge PR #42 via gh CLI
/merge --rebase               # rebase current branch onto main
/merge --cleanup              # remove stale local branches + worktrees
/merge --squash feature/xyz   # squash-merge a noisy feature branch

Dispatch rules

Parse the user's arguments, then dispatch the merge agent with a clear task prompt. Include:

  1. Source branch — from args, or detect with git branch --show-current
  2. Target branch — default main, or from args
  3. Strategy — ff-rebase (default), squash, merge-commit, or PR merge
  4. Scope — full merge vs. cleanup-only vs. conflict resolution only

Scenario detection (when no args given)

Run git status and git branch -vv to detect the situation:

StateAction
On a feature branch with commits ahead of mainRebase + fast-forward merge
Unmerged paths in working treeConflict resolution mode
Local branches marked [gone]Stale branch + worktree cleanup
Clean working tree on mainReport "nothing to merge" cleanly

Safety reminders (pass to agent)

  • Hard-block force-merge to main/master — require approve force-merge in writing
  • Always show git diff --stat before executing
  • Verify merge before any branch deletion
  • Never delete the currently checked-out branch

Dispatch

Use the Agent tool to dispatch merge with the full context assembled above.

Do not execute git commands inline — hand off to the agent.

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