New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Git Merge

by SpecterOps in SpecterOps/skills

Complex git operations — merge conflict resolution, cherry-picks, rebases.

Apache-2.0Auto-check passedDevelopment

Install Git Merge

skills CLI
$ npx skills add SpecterOps/skills --skill git-merge -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install SpecterOps/skills git-merge --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/SpecterOps/skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/plugins/workflows-development/skills/git-merge .claude/skills/git-merge && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
git-merge
GitHub stars
702
Token cost
~1.2k tokens
SKILL.md length
636 words
Files
4 (incl. assets)
Skills in repo
38
Repo updated
First seen
Licence
Apache-2.0

At a glance

Complex git operations — merge conflict resolution, cherry-picks, rebases.

  • Works in 2 steps: Verify we're in a git repository (git… → If not in a git repo, tell the user and…
  • Merging branches
  • SKILL.md covers Prerequisites, Action: status, Action: resolve (default) and Action: branch, plus 4 more sections
  • Calls git

What it does

Git Merge is an agent skill from SpecterOps/skills. Complex git operations — merge conflict resolution, cherry-picks, rebases. Use when merging branches, resolving conflicts, cherry-picking commits, or rebasing.

Its SKILL.md is about 1.2k tokens, which your agent loads only when the skill is triggered. The skill folder holds 5 other files, including assets (for example `agents/openai.yaml`).

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: A marketplace for LLM skills. The licence is Apache-2.0.

When your agent uses it

  • Merging branches
  • Resolving conflicts
  • Cherry-picking commits

Example prompts

  • “/git-merge”

Workflow steps

2 steps, taken from the first numbered list in SKILL.md.

  1. Verify we're in a git repository (git rev-parse --is-inside-work-tree)
  2. If not in a git repo, tell the user and stop

What it can do on your machine

Read from SKILL.md and the folder at commit e655f93. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Git Merge loads about 1.2k tokens when it runs. Until then it costs about 42 tokens; SKILL.md has 636 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~42
When it runs · the whole SKILL.md, loaded when a task matches
~1.2k

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from SpecterOps/skills at commit e655f93, republished under its Apache-2.0 licence (© SpecterOps). 636 words, ~1,208 tokens.

Download SKILL.mdSave it as .claude/skills/git-merge/SKILL.md (or your agent's skills folder). This skill also uses 3 other files; get the full folder from GitHub.
name
git-merge
description
Complex git operations — merge conflict resolution, cherry-picks, rebases. Use when merging branches, resolving conflicts, cherry-picking commits, or rebasing.
metadata.author
GhostWorks

Git Merge & Conflict Resolution

Handle complex git operations: merges, cherry-picks, rebases, and conflict resolution.

Parse the user's input to determine the action:

  • $git-merge or $git-merge resolve — detect and resolve current conflicts
  • $git-merge branch <name> — merge a branch into current, handle conflicts
  • $git-merge cherry-pick <commit>... — cherry-pick with conflict handling
  • $git-merge rebase <base> — non-interactive rebase onto base
  • $git-merge abort — abort in-progress merge/rebase/cherry-pick
  • $git-merge status — show current merge/rebase/cherry-pick state

Prerequisites

  1. Verify we're in a git repository (git rev-parse --is-inside-work-tree)
  2. If not in a git repo, tell the user and stop

Action: status

  1. Run git status to show branch and state
  2. Check for in-progress operations:
    • .git/MERGE_HEAD → merge in progress
    • .git/rebase-merge/ or .git/rebase-apply/ → rebase in progress
    • .git/CHERRY_PICK_HEAD → cherry-pick in progress
  3. If conflicts exist, list conflicted files with git status --porcelain (look for UU, AA, DD, AU, UA)
  4. Report current branch, upstream tracking, and any in-progress operation

Action: resolve (default)

  1. Run git status --porcelain to find conflicted files (UU, AA, DD, AU, UA prefixes)
  2. If no conflicts found, report clean state and stop
  3. For each conflicted file: a. Read the file to find <<<<<<<, =======, >>>>>>> conflict markers b. Read surrounding context and related tests to understand intent of both sides c. If the resolution is clear (e.g., both sides made non-overlapping changes within the same hunk), resolve by editing the file — remove all conflict markers and produce the correct merged result d. If the resolution is ambiguous, show both sides to the user and ask which approach to take — never silently pick a side e. For binary file conflicts, ask the user to choose --ours or --theirs f. After resolving each file, run git add <file>
  4. After all files are resolved:
    • If merge: git commit (use git's default merge message, do NOT use conventional commit style)
    • If rebase: git rebase --continue
    • If cherry-pick: git cherry-pick --continue

Action: branch <name>

  1. Verify the branch exists (git rev-parse --verify <name>)
  2. Show what will be merged: git log --oneline HEAD..<name> (commits coming in)
  3. Run git merge <name>
  4. If merge succeeds cleanly, report success with merge commit
  5. If merge has conflicts, follow the resolve workflow above
  6. Use git's default merge commit message — do NOT override with conventional commit style
Show full SKILL.md (264 more words)Show less

Action: cherry-pick <commit>...

  1. Validate each commit exists (git rev-parse --verify <commit>)
  2. Show what will be cherry-picked: git log --oneline -1 <commit> for each
  3. Run git cherry-pick <commit>...
  4. If clean, report success
  5. If conflicts, follow the resolve workflow above

Action: rebase <base>

  1. Identify current branch name
  2. Protected branch warning: If current branch is main, master, or develop, warn the user that rebasing a protected branch is dangerous and ask for explicit confirmation before proceeding
  3. Show what will be replayed: git log --oneline <base>..HEAD
  4. Warn the user: after rebase, they'll need git push --force-with-lease to update the remote — never force-push automatically
  5. Run git rebase <base> (non-interactive only — git rebase -i requires an interactive terminal)
  6. If clean, report success
  7. If conflicts, follow the resolve workflow for each step, using git rebase --continue after each resolution

Action: abort

  1. Detect what's in progress:
    • .git/MERGE_HEAD → git merge --abort
    • .git/rebase-merge/ or .git/rebase-apply/ → git rebase --abort
    • .git/CHERRY_PICK_HEAD → git cherry-pick --abort
  2. If nothing is in progress, tell the user
  3. Run the appropriate abort command
  4. Show git status to confirm clean state

Safety Rules

  • Never force-push — warn the user they'll need --force-with-lease after rebase
  • Never use git rebase -i — interactive mode requires a terminal that cannot be provided in this context
  • Ask on ambiguous conflicts — never silently choose a side
  • Warn on protected branches — main, master, develop get explicit warnings before rebase
  • Merge commits use git's default message — only manual commits follow conventional commit style
  • Check for uncommitted changes before starting operations — warn if working tree is dirty

© SpecterOps, Apache-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

SKILL.md and 3 other files (assets) in plugins/workflows-development/skills/git-merge of SpecterOps/skills.

  • SKILL.md
  • agents/openai.yaml
  • assets/icon.png
  • assets/icon.svg

Open the folder on GitHubat commit e655f93

Compare with similar skills

Git Merge next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Git Merge compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Merge this skillSpecterOps/skills702—~1.2kAutomated safety check: PassApache-2.0
Finishing a Development Branchobra/superpowers296k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins10k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost55k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    296k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Code Design Rationale Investigator

    cursor/plugins

    Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Migrate Internal Package into Ghost

    TryGhost/Ghost

    Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    55k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed

  • Create Pull Request

    cline/cline

    Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from SpecterOps/skills

All 38 skills in this repo

  • Codex Activity Report

    SpecterOps/skills

    Generate a normalized UTC timeline and evidence-based narrative from Codex activity artifacts.

    702 GitHub stars~805 tokensUpdated 15 days ago
    Auto-check passed

  • Com Proxy Triage

    SpecterOps/skills

    A skill your agent uses when the user wants to triage Windows COM proxy/hijack candidates by capturing HKCU\Software\Classes\CLSID\{...}\InProcServer32 NAME NOT FOUND lookups for a process, mapping…

    702 GitHub stars~1.5k tokensUpdated 15 days ago
    Auto-check passed

  • Cwe Code Review

    SpecterOps/skills

    Perform CWE-grounded security code reviews and precise weakness mapping using a locally derived MITRE CWE corpus, relationship graphs, mapping notes, detection methods, mitigations, and schema…

    702 GitHub stars~2.4k tokensUpdated 15 days ago
    Auto-check passed

  • Ghostwriter Oplog

    SpecterOps/skills

    A skill your agent uses for Ghostwriter operation log entries from Codex, including config guidance, quick notes, evidence-backed entries, and guided oplog capture through the Ghostwriter MCP tools.

    702 GitHub stars~665 tokensUpdated 15 days ago
    Auto-check passed

  • Nmap Parse

    SpecterOps/skills

    Parse nmap scan output and generate actionable recon notes. An agent skill from SpecterOps/skills.

    702 GitHub stars~738 tokensUpdated 15 days ago
    Auto-check passed

  • Osint Recon

    SpecterOps/skills

    Perform OSINT and external reconnaissance for approved targets.

    702 GitHub stars~813 tokensUpdated 15 days ago
    Auto-check passed

Works with

Categories

Questions about Git Merge

What does Git Merge do?

Complex git operations — merge conflict resolution, cherry-picks, rebases. Git Merge is an agent skill from SpecterOps/skills. Complex git operations — merge conflict resolution, cherry-picks, rebases.

When should I use Git Merge?

Git Merge fits situations like: merging branches; resolving conflicts; cherry-picking commits.

How do I install Git Merge in Claude Code?

Run `npx skills add SpecterOps/skills --skill git-merge -a claude-code`. Or copy the skill folder (plugins/workflows-development/skills/git-merge in SpecterOps/skills) into .claude/skills/git-merge in your project. Claude Code loads it when a task matches its description.

How do I install Git Merge in Codex?

Run `npx skills add SpecterOps/skills --skill git-merge -a codex`. Or copy the skill folder (plugins/workflows-development/skills/git-merge in SpecterOps/skills) into .agents/skills/git-merge in your project. Codex loads it when a task matches its description.

Can I use Git Merge in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add SpecterOps/skills --skill git-merge -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-merge, .gemini/skills/git-merge, .github/skills/git-merge and .opencode/skills/git-merge in your project.

What does Git Merge need to run?

Going by SKILL.md and its folder, Git Merge needs the command-line tools its instructions call (git).

Does Git Merge access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Git Merge safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Git Merge use?

Git Merge is published under the Apache-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Merge use?

About 1.2k tokens (SKILL.md is roughly 4.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Git Merge?

Skills that share tags, products or a category with Git Merge: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Merge?

SpecterOps (a GitHub organization) maintains it in SpecterOps/skills, which has 702 GitHub stars. The repository holds 38 skills in this directory. The repository was last updated on September 23, 2026.

Source: SpecterOps/skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.