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 Workflow

by ownpilot in ownpilot/OwnPilot

Guides you through Git workflows — branching strategies, commit conventions, merge conflict resolution, and release management.

MITAuto-check passedDevelopment

Install Git Workflow

skills CLI
$ npx skills add ownpilot/OwnPilot --skill git-workflow -a claude-code

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

GitHub CLI
$ gh skill install ownpilot/OwnPilot 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/ownpilot/OwnPilot.git skills-src && mkdir -p .claude/skills && cp -r skills-src/packages/gateway/data/example-skills/git-workflow .claude/skills/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
git-workflow
GitHub stars
426
Token cost
~572 tokens
SKILL.md length
244 words
Files
1
Skills in repo
9
Repo updated
First seen
Licence
MIT

At a glance

Guides you through Git workflows — branching strategies, commit conventions, merge conflict resolution, and release management.

  • Works in 5 steps: Understand both sides — read the… → Keep both changes when they modify… → Choose the newer logic when they modify… → …
  • Working with Git repositories
  • SKILL.md covers Commit Messages, Branching Strategy, Merge Conflict Resolution and Pull Request Checklist, plus 1 more section
  • Calls git

What it does

Git Workflow is an agent skill from ownpilot/OwnPilot. Guides you through Git workflows — branching strategies, commit conventions, merge conflict resolution, and release management. Use when working with Git repositories or when the user asks about version control best practices.

Its SKILL.md is about 570 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Privacy-first personal AI assistant platform with autonomous agents, tool orchestration, and multi-provider support. The licence is MIT.

When your agent uses it

  • Working with Git repositories
  • The user asks about version control best practices

Example prompts

  • “Use the git-workflow skill to guide you through Git workflows — branching strategies, commit conventions, merge conflict resolution, and release…”
  • “/git-workflow”

Requirements

  • Pre-approved tools (allowed-tools): Bash(git:*)

Workflow steps

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

  1. Understand both sides — read the conflicting changes before resolving
  2. Keep both changes when they modify different things
  3. Choose the newer logic when they modify the same thing
  4. Test after resolving — conflicts in logic can introduce subtle bugs
  5. Never blindly accept one side — "accept theirs" / "accept ours" loses work

What it can do on your machine

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

  • Tool permissions

    Pre-approves these tools, so the agent can use them without asking each time:

    • Bash(git:*)

    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 Workflow loads about 572 tokens when it runs. Until then it costs about 60 tokens; SKILL.md has 244 words of instructions outside code blocks.

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

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 ownpilot/OwnPilot at commit eb4c27f, republished under its MIT licence (© ownpilot). 244 words, ~572 tokens.

Download SKILL.mdSave it as .claude/skills/git-workflow/SKILL.md (or your agent's skills folder).
name
git-workflow
description
Guides you through Git workflows — branching strategies, commit conventions, merge conflict resolution, and release management. Use when working with Git repositories or when the user asks about version control best practices.
allowed-tools
Bash(git:*)
license
MIT
metadata.author
ownpilot
metadata.version
1.0.0

Git Workflow

You are an expert in Git version control. Follow these guidelines when helping with Git operations.

Commit Messages

Use Conventional Commits format:

<type>(<scope>): <description>

[optional body]

[optional footer]

Types: feat, fix, refactor, docs, test, chore, perf, ci, build

Examples:

  • feat(auth): add JWT refresh token rotation
  • fix(api): handle null response from payment gateway
  • refactor(db): extract repository base class

Branching Strategy

Default: GitHub Flow (simple, PR-based)

  • main — always deployable
  • feature/<name> — short-lived feature branches
  • fix/<name> — bug fix branches
  • release/<version> — release prep (if needed)

Merge Conflict Resolution

  1. Understand both sides — read the conflicting changes before resolving
  2. Keep both changes when they modify different things
  3. Choose the newer logic when they modify the same thing
  4. Test after resolving — conflicts in logic can introduce subtle bugs
  5. Never blindly accept one side — "accept theirs" / "accept ours" loses work

Pull Request Checklist

Before submitting a PR:

  • Descriptive title (imperative: "Add feature" not "Added feature")
  • Summary of what and why (not how — the code shows how)
  • Tests added/updated for new behavior
  • No unrelated changes mixed in
  • No console.log / debug code left behind
  • Self-reviewed the diff one more time

Common Operations

When the user asks you to:

  • Create a branch: git checkout -b feature/<name>
  • Stage changes: Prefer git add <specific-files> over git add .
  • Amend last commit: git commit --amend (only if not pushed)
  • Squash commits: git rebase -i HEAD~N (only on local branches)
  • Undo last commit: git reset --soft HEAD~1 (keeps changes staged)
  • Cherry-pick: git cherry-pick <hash> (apply specific commit to current branch)

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

Files

Just SKILL.md in packages/gateway/data/example-skills/git-workflow of ownpilot/OwnPilot.

Open the folder on GitHubat commit eb4c27f

Compare with similar skills

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.

Git Workflow compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Workflow this skillownpilot/OwnPilot426—~572Automated safety check: PassMIT
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 ownpilot/OwnPilot

All 9 skills in this repo

  • Code Review

    ownpilot/OwnPilot

    Reviews code for quality issues, security vulnerabilities, performance problems, and best practices.

    426 GitHub stars~493 tokensUpdated 29 days ago
    Auto-check passed

  • API Debugging

    ownpilot/OwnPilot

    Systematic approach to debugging REST APIs, HTTP errors, authentication issues, and network problems.

    426 GitHub stars~824 tokensUpdated 29 days ago
    Auto-check passed

  • Writing Assistant

    ownpilot/OwnPilot

    Helps improve writing quality — emails, documents, blog posts, and technical content.

    426 GitHub stars~532 tokensUpdated 29 days ago
    Auto-check passed

  • Document Assistant

    ownpilot/OwnPilot

    OwnPilot official general skill for drafting, editing, restructuring, and reviewing long-form documents, reports, proposals, policies, and documentation.

    426 GitHub stars~302 tokensUpdated 29 days ago
    Auto-check passed

  • Meeting Notes

    ownpilot/OwnPilot

    OwnPilot official general skill for converting rough meeting notes, transcripts, and call summaries into decisions, action items, owners, risks, and follow-ups.

    426 GitHub stars~298 tokensUpdated 29 days ago
    Auto-check passed

  • Presentation Builder

    ownpilot/OwnPilot

    OwnPilot official general skill for creating slide outlines, executive narratives, speaker notes, and presentation critiques.

    426 GitHub stars~285 tokensUpdated 29 days ago
    Auto-check passed

Works with

Categories

Questions about Git Workflow

What does Git Workflow do?

Guides you through Git workflows — branching strategies, commit conventions, merge conflict resolution, and release management. Git Workflow is an agent skill from ownpilot/OwnPilot. Guides you through Git workflows — branching strategies, commit conventions, merge conflict resolution, and release management.

When should I use Git Workflow?

Git Workflow fits situations like: working with Git repositories; the user asks about version control best practices.

How do I install Git Workflow in Claude Code?

Run `npx skills add ownpilot/OwnPilot --skill git-workflow -a claude-code`. Or copy the skill folder (packages/gateway/data/example-skills/git-workflow in ownpilot/OwnPilot) into .claude/skills/git-workflow in your project. Claude Code loads it when a task matches its description.

How do I install Git Workflow in Codex?

Run `npx skills add ownpilot/OwnPilot --skill git-workflow -a codex`. Or copy the skill folder (packages/gateway/data/example-skills/git-workflow in ownpilot/OwnPilot) into .agents/skills/git-workflow in your project. Codex loads it when a task matches its description.

Can I use 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 ownpilot/OwnPilot --skill 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/git-workflow, .gemini/skills/git-workflow, .github/skills/git-workflow and .opencode/skills/git-workflow in your project.

What does Git Workflow need to run?

Going by SKILL.md and its folder, Git Workflow needs the command-line tools its instructions call (git). Its frontmatter pre-approves these tools: Bash(git:*).

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

Git Workflow is published under the MIT licence (declared in SKILL.md). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Workflow use?

About 572 tokens (SKILL.md is roughly 2.3k 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 Workflow?

Skills that share tags, products or a category with Git Workflow: 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 Workflow?

ownpilot (a GitHub organization) maintains it in ownpilot/OwnPilot, which has 426 GitHub stars. The repository holds 9 skills in this directory. The repository was last updated on September 8, 2026.

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