agentleFS
Sign inStart free
vibe-cokitvibe-cokit/claude-code/skills/vk-git-merge/SKILL.md

vk-git-merge

Skill1 starsChanged 4 months agoApache-2.0View on GitHub

⚠️ Merge code from one branch to another

  • Commits and pushes

The file

We split this skill into the rules it gives an agent

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

  • ≈0

    Common · estimate

    Many files like this have a rule of this kind.

  • ≈2

    Distinctive · estimate

    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:

    If conflicts exist, resolve them manually

    line 30
  2. Very specific:

    If gh command is not available, instruct the user to install and authorize GitHub CLI first.

    line 39
  3. Very specific:

    If you need more clarifications, use AskUserQuestion tool to ask the user for more details.

    line 40
  4. Distinctive:

    Always fetch and pull latest remote state before merging to avoid stale conflicts.

    line 41

≈ “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

Variables

TO_BRANCH: $1 (defaults to main) FROM_BRANCH: $2 (defaults to current branch)

Workflow

Step 1: Sync with remote (CRITICAL)

git fetch origin
git checkout {TO_BRANCH}
git pull origin {TO_BRANCH}

Step 2: Merge from REMOTE tracking branch

# Use origin/{FROM_BRANCH} to merge remote state, not local WIP
git merge origin/{FROM_BRANCH} --no-ff -m "merge: {FROM_BRANCH} into {TO_BRANCH}"

Why origin/{FROM_BRANCH}: Ensures merging only committed+pushed changes, not local uncommitted work.

Step 3: Resolve conflicts if any

  • If conflicts exist, resolve them manually
  • After resolution: git add . && git commit

Step 4: Push merged result

git push origin {TO_BRANCH}

Notes

  • If gh command is not available, instruct the user to install and authorize GitHub CLI first.
  • If you need more clarifications, use AskUserQuestion tool to ask the user for more details.
  • Always fetch and pull latest remote state before merging to avoid stale conflicts.

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