agentleFS
KUNDURUHIMANEESHREDDYKUNDURUHIMANEESHREDDY/saber/.agents/skills/merge/SKILL.md

merge

Skill0 starsChanged 57 days agoMITView on GitHub

Merge changes from the topic branch to the merge base branch. Use when the user wants to merge their session's work back to the base branch.

58 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, 4 are distinctive, and 2 are very specific to this project.

  • 0

    Common

    Most of the 50 edited versions we read keep these.

  • 4

    Distinctive

    This author's own choices. Worth a look.

  • 2

    Very specific

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

  • Common
  • Distinctive
  • Very specific
  1. Distinctive:

    When in doubt about conflict resolution — ask the user.

    line 16
  2. Distinctive:

    Check for uncommitted changes in the current worktree:

    line 22
  3. Very specific:

    If there are uncommitted changes, use the /commit skill to commit them before continuing.

    line 26
  4. Very specific:

    Use git -C <main-worktree-path> to run commands against the main worktree without leaving the current worktree.

    line 30
  5. Distinctive:

    If the merge reports conflicts:

    line 38
  6. Distinctive:

    After the merge completes, verify the result:

    line 62

“Common” is measured: kept by at least 6 in 10 of the 50 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
<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. -->

Merge Changes

Merge the topic branch (checked out in the current worktree) into the merge base branch (checked out in the main worktree). The context block appended to the prompt contains the source branch, target branch, and main worktree path.

Guidelines

  • Never force-push (--force, --force-with-lease) without explicit user approval.
  • Never skip pre-push hooks (do not use --no-verify).
  • Never rewrite or drop commits without asking the user.
  • When in doubt about conflict resolution — ask the user.

Workflow

1. Commit uncommitted changes in the current worktree

Check for uncommitted changes in the current worktree:

git status --porcelain

If there are uncommitted changes, use the /commit skill to commit them before continuing.

2. Merge the topic branch into the base branch

Use git -C <main-worktree-path> to run commands against the main worktree without leaving the current worktree.

git -C <main-worktree-path> merge <topic-branch>

3. Handle merge conflicts

If the merge reports conflicts:

3.1. List conflicted files:

git -C <main-worktree-path> diff --name-only --diff-filter=U

3.2. For each conflicted file, read the file content, resolve the conflict by preserving the intent of both sides, and stage the resolved file:

git -C <main-worktree-path> add <resolved-file>

3.3. When in doubt on how to resolve a merge conflict, ask the user for guidance. If the user wants to abort, run:

git -C <main-worktree-path> merge --abort

3.4. Once all conflicts are resolved and staged, commit the merge:

git -C <main-worktree-path> commit --no-edit

Validation

After the merge completes, verify the result:

  1. Confirm the main worktree is clean:
git -C <main-worktree-path> status --porcelain
  1. Confirm the topic branch is an ancestor of the base branch (i.e. all commits are merged):
git -C <main-worktree-path> merge-base --is-ancestor <topic-branch> HEAD

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.