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

Omh Git Workflow

by rlaope in rlaope/oh-my-hermes

[omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push…

MITAuto-check passedDevelopment

Install Omh Git Workflow

skills CLI
$ npx skills add rlaope/oh-my-hermes --skill omh-git-workflow -a claude-code

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

GitHub CLI
$ gh skill install rlaope/oh-my-hermes omh-git-workflow --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/rlaope/oh-my-hermes.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/omh-git-workflow .claude/skills/omh-git-workflow && 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
omh-git-workflow
GitHub stars
3.2k
Token cost
~2.2k tokens
SKILL.md length
1,166 words
Files
2 (incl. references)
Skills in repo
143
Repo updated
First seen
Licence
MIT

At a glance

[omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push…

  • The user says: git-workflow
  • SKILL.md covers Why This Exists, First Steps, Do Not Use When and Examples, plus 6 more sections
  • Calls git
  • Merge conflicts

What it does

Omh Git Workflow is an agent skill from rlaope/oh-my-hermes. [omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push only with --force-with-lease. Use when the user says: git-workflow, git workflow, merge conflict, merge conflicts, rebase conflict, resolve the conflict, resolve this conflict, conflict markers.

Its SKILL.md is about 2.2k tokens, which your agent loads only when the skill is triggered. The skill folder holds 2 other files, including reference files (for example `references/git-repair-method.md`).

It sits in Development, covering Git workflow. The repository describes itself as: All in one plugin for Hermes Agent ⚚ the coding intelligence, a long-term memory system and model optimized workflow packages. The licence is MIT.

When your agent uses it

  • The user says: git-workflow
  • Merge conflicts
  • Rebase conflict
  • Resolve the conflict

Example prompts

  • “/omh-git-workflow”

What it can do on your machine

Read from SKILL.md and the folder at commit 41de9dc. 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

Omh Git Workflow loads about 2.2k tokens when it runs, and up to ~3.3k if it reads all its reference files. Until then it costs about 103 tokens; SKILL.md has 1,166 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~103
When it runs · the whole SKILL.md, loaded when a task matches
~2.2k
With references · SKILL.md plus every file in references/, read only if the agent opens them
~3.3k

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 rlaope/oh-my-hermes at commit 41de9dc, republished under its MIT licence (© rlaope). 1,166 words, ~2,197 tokens.

Download SKILL.mdSave it as .claude/skills/omh-git-workflow/SKILL.md (or your agent's skills folder). This skill also uses 1 other file; get the full folder from GitHub.
name
omh-git-workflow
description
[omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push only with `--force-with-lease`. Use when the user says: git-workflow, git workflow, merge conflict, merge conflicts, rebase conflict, resolve the conflict, resolve this conflict, conflict markers.

Git Workflow

This is a Hermes-native git-workflow workflow skill.

Why This Exists

git-workflow exists because conflict resolution, bisect, and history repair had no owner: "resolve this merge conflict" reached a file operator and "clean up this branch's history" a live-information lane, while this repository's own incidents -- a stack that replayed its base commits, a commit landing on another session's branch -- each had a known correct procedure.

First Steps

  • Name what is already pushed: each branch involved with its local head, its remote head, and whether others may have fetched it.
  • Before any step that rewrites history, name its recovery point.

Do Not Use When

  • The request is to write the commit message or the PR body for a finished change; use commit-pr-authoring.
  • The request is to find defects in a diff before merging it; use code-review.
  • The build or CI job fails and the question is why; use build-failure-triage.
  • The request is a code change to deliver rather than branch or history repair; use ultrawork.

Examples

Good example:

  • Prompt: clean up this branch's history before review
  • Expected behavior: Prepare pushed_state_inventory/v1 first, then history_rewrite_plan/v1 with a backup branch before the interactive rebase and --force-with-lease for the push, naming who must re-fetch.
  • Why: Whether the branch is pushed decides whether the cleanup is local or shared.

Bad example:

  • Prompt: just force push my rebased branch over main
  • Expected behavior: Refuse the bare force-push: inventory what is pushed on main, and plan --force-with-lease onto the feature branch only.
  • Why: A bare force-push over a shared branch discards other people's commits without a check.

Completion Checklist

  • The pushed-state inventory names every branch the plan touches.
  • Every rewriting step has a recovery point in front of it.
  • Every force-push in the plan uses --force-with-lease.
  • Generated and counted files in a conflict are re-derived, not picked.
  • Resolution, bisect verdict, and push are reported only from observed output.

Recovery Notes

  • If the remote state is unknown, plan git fetch and the inventory first and rewrite nothing until it is observed.
  • If a rewrite went wrong, recover from the recovery point or the reflog entry before trying anything else.

Workflow Lane

  • Current lane: Coding handoff (idea-to-deploy, llm-app-dev, cto-loop, deploy-and-monitor, code-review, build-failure-triage, verification-gate, security-safety-review, +28 more) - coding owners, handoffs, review, CI, and merge evidence.
  • If intent belongs to another lane, hand back to oh-my-hermes or name the adjacent workflow.
  • Shared product, routing, compatibility, and evidence rules: omh-routing/references/skill-common-rail.md.

Use When

Use when a git branch needs repair rather than new code: a merge or rebase conflict to resolve, a regression to bisect to the commit that introduced it, or history to rewrite, squash, recover, or rebase -- including a stack of branches. The work is a plan that names what is already pushed, what each step rewrites, and how to get back.

Strong routing signals: `git-workflow`, `git workflow`, `merge conflict`, `merge conflicts`, `rebase conflict`, `resolve the conflict`, `resolve this conflict`, `conflict markers`, `git bisect`, `bisect`, `which commit broke`, `find the commit that broke`, `rewrite history`, `rewrite the history`, `branch history`, `branch's history`, `clean up the history`, `interactive rebase`, `squash commits`, `squash the commits`, `force push`, `force-push`, `force-with-lease`, `reflog`, `git reset`, `lost commit`, `recover the commit`, `undo the last commit`, `cherry-pick`, `stacked prs`, `stacked branches`, `rebase the stack`, `detached head`

Catalog Metadata

Category: verification Phase: git-repair Hermes role: reviewer Quality tier: history-safety-gated Reasoning demand: standard

Quality bar:

  • Start with the pushed-state inventory; a plan without it cannot say which steps are safe.
  • Mark every step that rewrites history and put its recovery point in front of it.
  • Load references/git-repair-method.md for the conflict, bisect, rewrite, and stacked-branch procedures instead of improvising them.
  • For a stack of branches, rebase each onto the new head of the one below with --onto and the old base, never with a merge-base computed after the base moved.
  • Report each step's observed output, and keep resolved, verified, and pushed as separate states.

Handoff policy:

Keep the pushed-state inventory, the step plan, and the recovery points in Hermes. Every git command is run by the user or the executor; a resolution, a bisect verdict, or a rewrite is recorded only from their observed output.

Required inputs:

  • the branch or branches involved and their upstreams
  • what is already pushed, and who else may have fetched it
  • the conflict, the regression, or the history problem as observed
  • for a bisect: a known good commit, a known bad commit, and the command that tells them apart
  • the repository's merge policy: merge commits, squash, or rebase
Show full SKILL.md (424 more words)Show less

Expected outputs:

  • pushed_state_inventory/v1
  • git_repair_plan/v1
  • conflict_resolution_plan/v1 when files conflict
  • bisect_plan/v1 when a regression is hunted
  • history_rewrite_plan/v1 when commits are rewritten
  • observed_git_result/v1 when observed

Artifact expectations:

  • pushed_state_inventory/v1 lists each branch with its local head, its remote head, whether they match, and whether anyone else may have the remote commits
  • git_repair_plan/v1 orders the steps, marks each one that rewrites history, and names the recovery point (a backup ref or reflog entry) before it
  • conflict_resolution_plan/v1 decides each conflicted hunk by what both sides intended, and re-derives generated or counted files from their producer instead of picking a side
  • bisect_plan/v1 names the good and bad commits and the exact test command, so each step is a run rather than a judgement
  • history_rewrite_plan/v1 uses --force-with-lease for every force-push and says which collaborators must re-fetch

Safety rules:

  • Name what is already pushed before planning any rewrite; a rewrite of pushed commits is a decision for everyone who fetched them, not a local cleanup.
  • Force-push only with --force-with-lease; a bare --force or -f push is never part of the plan.
  • Create a recovery point -- a backup branch or a noted reflog entry -- before every step that rewrites history.
  • Never resolve a conflict in a generated or counted file by picking a side; re-derive it from its producer after the merge.
  • Do not run git commands from OMH core, and do not claim a resolution, a bisect verdict, or a pushed rewrite until its output is observed.

Runtime Evidence

Record observed delegation results; otherwise return not_available or not_observed. Prepared OMH routing is not execution, review, CI, merge-readiness, or merge evidence.

  • Treat wrapper memory/context summaries as advisory local context, not proof of opaque Hermes memory reads or changes. Preserve workflow intent and stop conditions; verify before claiming completion. Reply in the user's own words and the host's own voice: its SOUL.md persona owns reply language, tone, speech level, and sentence endings, progress updates included (where it sets no language, use the one the user wrote in), and OMH shapes structure and content only; OMH's record terms (surface, lane, wrapper, handoff, evidence boundary, not_observed) stay in records and tool calls, never in the sentence the user reads unless they ask about one; and when a stop condition or a decision the user owns ends the turn, offer the next action as a question rather than declaring what will not be done.

Use Hermes-native subagent/delegation features when available: native subagents -> Hermes delegation when available, otherwise sequential lanes.

Shared product, compatibility, topology, memory, harness, and execution rules: omh-routing/references/skill-common-rail.md. Load it when applicable; otherwise name an unavailable capability.

© rlaope, MIT. 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 1 other file (references) in skills/omh-git-workflow of rlaope/oh-my-hermes.

  • SKILL.md
  • references/git-repair-method.md

Open the folder on GitHubat commit 41de9dc

Compare with similar skills

Omh Git Workflow 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.

Omh Git Workflow compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Omh Git Workflow this skillrlaope/oh-my-hermes3.2k—~2.2kAutomated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 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/Ghost56k—~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.

    297k 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.

    56k 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

  • Contextual Commit Messages

    yamadashy/repomix

    Writes Conventional Commits whose bodies carry action lines recording the intent, decisions and constraints behind a change, not only what changed.

    29k GitHub starsUsed in 1 repo~2.7k tokens
    DevelopmentAuto-check passed

More from rlaope/oh-my-hermes

All 143 skills in this repo

  • Omh Accessibility Audit

    rlaope/oh-my-hermes

    [omh] Screen-reader or keyboard accessibility gaps: prepare WCAG, keyboard, focus, screen-reader, target-size, and reflow evidence gates for UI surfaces.

    3.2k GitHub stars~2.8k tokensUpdated today
    Auto-check passed

  • Omh Agent Evaluation

    rlaope/oh-my-hermes

    [omh] Choosing between coding agents on evidence: compare executor or agent choices on reproducible tasks using quality, cost, time, tool, and evidence metrics.

    3.2k GitHub stars~2.1k tokensUpdated today
    Auto-check passed

  • Omh Agent Instructions

    rlaope/oh-my-hermes

    [omh] Agent instruction file for a repo -- AGENTS.md, CLAUDE.md, a Cursor rule: write or update what an agent cannot derive from the code, inside a marked region, with every command verified or…

    3.2k GitHub stars~2.2k tokensUpdated today
    Auto-check passed

  • Omh Agent Ops Review

    rlaope/oh-my-hermes

    [omh] AI agent progress for managers: help managers inspect AI-agent progress, blockers, quality gates, and throughput levers.

    3.2k GitHub stars~1.9k tokensUpdated today
    Auto-check passed

  • Omh AI Slop Cleaner

    rlaope/oh-my-hermes

    [omh] Messy or AI-generated code to clean up: delete AI-generated slop, dead code, and duplication while observable behavior stays identical.

    3.2k GitHub stars~2.7k tokensUpdated today
    Auto-check passed

  • Omh App Debugging

    rlaope/oh-my-hermes

    [omh] Application code misbehaves -- a wrong value, a flaky test, a lost update: reproduce it first, form competing hypotheses, discriminate them with the cheapest observation, and only then fix the…

    3.2k GitHub stars~2.3k tokensUpdated today
    Auto-check passed

Categories

Questions about Omh Git Workflow

What does Omh Git Workflow do?

[omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push…. Omh Git Workflow is an agent skill from rlaope/oh-my-hermes. [omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push only with --force-with-lease.

When should I use Omh Git Workflow?

Omh Git Workflow fits situations like: the user says: git-workflow; merge conflicts; rebase conflict; resolve the conflict.

How do I install Omh Git Workflow in Claude Code?

Run `npx skills add rlaope/oh-my-hermes --skill omh-git-workflow -a claude-code`. Or copy the skill folder (skills/omh-git-workflow in rlaope/oh-my-hermes) into .claude/skills/omh-git-workflow in your project. Claude Code loads it when a task matches its description.

How do I install Omh Git Workflow in Codex?

Run `npx skills add rlaope/oh-my-hermes --skill omh-git-workflow -a codex`. Or copy the skill folder (skills/omh-git-workflow in rlaope/oh-my-hermes) into .agents/skills/omh-git-workflow in your project. Codex loads it when a task matches its description.

Can I use Omh Git Workflow 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 rlaope/oh-my-hermes --skill omh-git-workflow -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/omh-git-workflow, .gemini/skills/omh-git-workflow, .github/skills/omh-git-workflow and .opencode/skills/omh-git-workflow in your project.

What does Omh Git Workflow need to run?

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

Does Omh Git Workflow 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 Omh Git Workflow 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 Omh Git Workflow use?

Omh Git Workflow is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Omh Git Workflow use?

About 2.2k tokens (SKILL.md is roughly 8.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full. Its references folder adds about 1.1k tokens, read only when the agent opens those files.

What are the alternatives to Omh Git Workflow?

Skills that share tags, products or a category with Omh Git Workflow: Finishing a Development Branch (obra/superpowers, 297k 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, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Omh Git Workflow?

rlaope (a GitHub user) maintains it in rlaope/oh-my-hermes, which has 3,233 GitHub stars. The repository holds 143 skills in this directory. The repository was last updated on October 8, 2026.

Source: rlaope/oh-my-hermes on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.