Agent skill

Git Workflow

Guided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns.

MITAuto-check: notesDevelopment

Install Git Workflow

skills CLI

$ npx skills add jezweb/claude-skills --skill git-workflow -a claude-code

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

GitHub CLI

$ gh skill install jezweb/claude-skills 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/jezweb/claude-skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/plugins/dev-tools/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/

Paste into Claude Code

Install the "git-workflow" agent skill from https://github.com/jezweb/claude-skills/tree/main/plugins/dev-tools/skills/git-workflow into .claude/skills/git-workflow/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-workflow", then confirm the skill loads.

Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

$skill-installer

$skill-installer install https://github.com/jezweb/claude-skills/tree/main/plugins/dev-tools/skills/git-workflow

Type this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.

skills CLI

$ npx skills add jezweb/claude-skills --skill git-workflow -a codex

Project install goes to .agents/skills/; add -g for ~/.codex/skills/.

GitHub CLI

$ gh skill install jezweb/claude-skills git-workflow --agent codex

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/jezweb/claude-skills.git skills-src && mkdir -p .agents/skills && cp -r skills-src/plugins/dev-tools/skills/git-workflow .agents/skills/git-workflow && rm -rf skills-src

Use ~/.agents/skills/ instead of .agents/skills for a personal install.

Codex skills documentation · loads skills from .agents/skills/

Paste into Codex

Install the "git-workflow" agent skill from https://github.com/jezweb/claude-skills/tree/main/plugins/dev-tools/skills/git-workflow into .agents/skills/git-workflow/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-workflow", then confirm the skill loads.

Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

skills CLI

$ npx skills add jezweb/claude-skills --skill git-workflow -a cursor

Project install goes to .agents/skills/; add -g for ~/.cursor/skills/.

GitHub CLI

$ gh skill install jezweb/claude-skills git-workflow --agent cursor

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/jezweb/claude-skills.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/plugins/dev-tools/skills/git-workflow .cursor/skills/git-workflow && rm -rf skills-src

Use ~/.cursor/skills/ instead of .cursor/skills for a personal install.

Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/

Paste into Cursor

Install the "git-workflow" agent skill from https://github.com/jezweb/claude-skills/tree/main/plugins/dev-tools/skills/git-workflow into .cursor/skills/git-workflow/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-workflow", then confirm the skill loads.

Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

gemini skills install

$ gemini skills install https://github.com/jezweb/claude-skills.git --path plugins/dev-tools/skills/git-workflow

--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.

skills CLI

$ npx skills add jezweb/claude-skills --skill git-workflow -a gemini-cli

Project install goes to .agents/skills/; add -g for ~/.gemini/skills/.

GitHub CLI

$ gh skill install jezweb/claude-skills git-workflow --agent gemini-cli

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/jezweb/claude-skills.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/plugins/dev-tools/skills/git-workflow .gemini/skills/git-workflow && rm -rf skills-src

Use ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.

Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/

Paste into Gemini CLI

Install the "git-workflow" agent skill from https://github.com/jezweb/claude-skills/tree/main/plugins/dev-tools/skills/git-workflow into .gemini/skills/git-workflow/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-workflow", then confirm the skill loads.

Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

GitHub CLI

$ gh skill install jezweb/claude-skills git-workflow

Installs for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).

skills CLI

$ npx skills add jezweb/claude-skills --skill git-workflow -a github-copilot

Project install goes to .agents/skills/; add -g for ~/.copilot/skills/.

Manual copy

$ git clone --depth 1 https://github.com/jezweb/claude-skills.git skills-src && mkdir -p .github/skills && cp -r skills-src/plugins/dev-tools/skills/git-workflow .github/skills/git-workflow && rm -rf skills-src

Use ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.

GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/

Paste into GitHub Copilot

Install the "git-workflow" agent skill from https://github.com/jezweb/claude-skills/tree/main/plugins/dev-tools/skills/git-workflow into .github/skills/git-workflow/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-workflow", then confirm the skill loads.

GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

skills CLI

$ npx skills add jezweb/claude-skills --skill git-workflow -a opencode

OpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.

GitHub CLI

$ gh skill install jezweb/claude-skills git-workflow --agent opencode

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/jezweb/claude-skills.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/plugins/dev-tools/skills/git-workflow .opencode/skills/git-workflow && rm -rf skills-src

Use ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.

OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/

Paste into OpenCode

Install the "git-workflow" agent skill from https://github.com/jezweb/claude-skills/tree/main/plugins/dev-tools/skills/git-workflow into .opencode/skills/git-workflow/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-workflow", then confirm the skill loads.

OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

Facts

Skill name: git-workflow
GitHub stars: 1.1k
Token cost: ~957 tokens
SKILL.md length: 302 words
Files: 1
Skills in repo: 52
Repo updated: Oct 5, 2026
First seen: Oct 7, 2026
Licence: MIT

At a glance

Guided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns.

Works in 4 steps: Gather context → Draft PR content → Push and create → …
Asked to prepare a PR
SKILL.md covers PR Preparation, Branch Cleanup, Merge Conflict Resolution and Monorepo Release Tags, plus 2 more sections
Calls git and gh; reaches claude.com

What it does

Git Workflow is an agent skill from jezweb/claude-skills. Guided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns. Use when asked to prepare a PR, clean branches, resolve conflicts, or tag a release.

Its SKILL.md is about 960 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts. Compatibility notes: claude-code-only

It sits in Development, covering Git workflow and Monorepo tooling. It works with Git. The repository describes itself as: Skills for Claude Code CLI such as full stack dev Cloudflare, React, Tailwind v4, and AI integrations. The licence is MIT.

When your agent uses it

Asked to prepare a PR
Resolve conflicts

Example prompts

“/git-workflow”

Requirements

Compatibility (from SKILL.md): claude-code-only

Workflow steps

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

Gather context
Draft PR content
Push and create
Verify — gh pr view --web to open in browser

What it can do on your machine

Read from SKILL.md and the folder at commit 64965d9. 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
- gh
From the folder's file list and the shell code blocks in SKILL.md.
Network
Hosts in commands or code, which the agent is likely to contact:
- claude.com
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.
Compatibility
claude-code-only
From compatibility in the SKILL.md frontmatter.

Context cost

Git Workflow loads about 957 tokens when it runs. Until then it costs about 56 tokens; SKILL.md has 302 words of instructions outside code blocks.

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

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: notes

The automated check noted patterns worth knowing about, such as sudo or a known installer.

NoteMentions a .env fileSKILL.md:128
```
.env
```
NoteMentions a .env fileSKILL.md:129
```
.env.local
```

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 jezweb/claude-skills at commit 64965d9, republished under its MIT licence (© jezweb). 302 words, ~957 tokens.

Download SKILL.mdSave it as .claude/skills/git-workflow/SKILL.md (or your agent's skills folder).

name: git-workflow
description: Guided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns. Use when asked to prepare a PR, clean branches, resolve conflicts, or tag a release.
compatibility: claude-code-only

Git Workflow

Guided workflows for common git operations that benefit from structured steps.

PR Preparation

When preparing a pull request:

Gather context
- git log main..HEAD --oneline — list all commits on the branch
- git diff main...HEAD --stat — see all changed files
- git status — check for uncommitted work
Draft PR content
- Title: under 70 chars, describes the change (not the branch name)
- Body: summarise the "why", list key changes, add test plan
- Use the commit history to write the summary — don't rely on memory

Push and create

bash

git push -u origin HEAD
gh pr create --title "..." --body "$(cat <<'EOF'
## Summary
- ...

## Test plan
- [ ] ...

🤖 Generated with [Claude Code](https://claude.com/claude-code)
EOF
)"

Verify — gh pr view --web to open in browser

Branch Cleanup

Clean up merged branches safely:

Switch to main and pull latest
bash
```
git checkout main && git pull
```

List merged branches (excludes main/master/develop)

bash

git branch --merged main | grep -vE '^\*|main|master|develop'

Delete local merged branches

bash

git branch --merged main | grep -vE '^\*|main|master|develop' | xargs -r git branch -d

Prune remote tracking refs
bash
```
git fetch --prune
```

List remote branches with no local tracking (optional)

bash

git branch -r --merged origin/main | grep -vE 'main|master|develop|HEAD'

Show full SKILL.md (193 more words)Show less

Merge Conflict Resolution

When a PR has conflicts:

Assess the conflict scope

bash

git fetch origin
git merge origin/main --no-commit --no-ff
git diff --name-only --diff-filter=U  # List conflicted files

For each conflicted file, read the file and resolve:
- Keep both changes if they're in different areas
- If architecturally incompatible, prefer the main branch's approach and re-apply the PR's intent on top

If rebase is cleaner (few commits, no shared history):

bash

git rebase origin/main
# Resolve conflicts per commit, then:
git rebase --continue

If rebase is messy (many conflicts, architectural divergence):
- Abort: git rebase --abort or git merge --abort
- Extract useful code: git show origin/branch:path/to/file > /tmp/extracted.txt
- Apply changes manually to main
- Close original PR with explanation
Verify — run tests, check the diff looks right

Monorepo Release Tags

In monorepos, scope tags to the package:

bash

# ❌ Ambiguous in monorepos
git tag v2.1.0

# ✅ Scoped to package
git tag contextbricks-v2.1.0
git push origin contextbricks-v2.1.0

Pattern: {package-name}-v{semver}

.gitignore-First Init

When creating a new repo, always create .gitignore BEFORE the first git add:

bash

cat > .gitignore << 'EOF'
node_modules/
.wrangler/
dist/
.dev.vars
*.log
.DS_Store
.env
.env.local
EOF

git init && git add . && git commit -m "Initial commit"

If node_modules is already tracked:

bash

git rm -r --cached node_modules/
git commit -m "Remove node_modules from tracking"

Private Repo License Audit

Before publishing or sharing a private repo:

bash

gh repo view --json visibility -q '.visibility'

If PRIVATE, ensure:

LICENSE contains proprietary notice (not MIT/Apache)
package.json has "license": "UNLICENSED" and "private": true
No CONTRIBUTING.md or "contributions welcome" in README

Files

Just SKILL.md in plugins/dev-tools/skills/git-workflow of jezweb/claude-skills.

Open the folder on GitHubat commit 64965d9

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
Skill	Stars	Used in	Tokens	Auto-check	Licence	Repo updated
Git Workflow this skilljezweb/claude-skills	1.1k	—	~957	Automated safety check: Notes	MIT	2 days ago
Migrate Internal Package into GhostTryGhost/Ghost	55k	—	~3.8k	Automated safety check: Pass	MIT	today
Light Project StructureLight0305/Light-skills	641	—	~3k	Automated safety check: Notes	MIT	3 mo ago
Subtree Publishcat-xierluo/legal-skills	713	—	~1.8k	Automated safety check: Notes	MIT	today
Finishing a Development Branchobra/superpowers	296k	5 repos	~1.9k	Automated safety check: Pass	MIT	today
Code Design Rationale Investigatorcursor/plugins	10k	9 repos	~2.6k	Automated safety check: Pass	None	today

Similar skills

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
Light Project Structure
Light0305/Light-skills
Audits, scaffolds and safely migrates research project folder structures, keeping existing repositories read-only until you approve exact moves from a plan.
641 GitHub stars~3k tokensUpdated 3 mo ago
DevelopmentAuto-check: notes
Subtree Publish
cat-xierluo/legal-skills
将 monorepo 中的子目录通过 git subtree 推送到独立 GitHub 仓库。支持注册清单、变更自动检测、增量推送。本技能应在用户提交涉及已注册子项目的变更后，或手动请求推送到独立仓库时使用。不要用于初次创建 monorepo 或管理 git submodule。
713 GitHub stars~1.8k tokensUpdated today
DevelopmentAuto-check: notes
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

Questions about Git Workflow

What does Git Workflow do?

Guided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns. Git Workflow is an agent skill from jezweb/claude-skills. Guided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns.

When should I use Git Workflow?

Git Workflow fits situations like: asked to prepare a PR; resolve conflicts.

How do I install Git Workflow in Claude Code?

Run `npx skills add jezweb/claude-skills --skill git-workflow -a claude-code`. Or copy the skill folder (plugins/dev-tools/skills/git-workflow in jezweb/claude-skills) 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 jezweb/claude-skills --skill git-workflow -a codex`. Or copy the skill folder (plugins/dev-tools/skills/git-workflow in jezweb/claude-skills) 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 jezweb/claude-skills --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 and gh). Compatibility (from SKILL.md): claude-code-only.

Does Git Workflow access the network?

SKILL.md names 1 domain. In commands or code: claude.com; the agent is likely to contact it when it follows the instructions. This is read from the text; nothing was executed.

Is Git Workflow safe to install?

Our automated static check of SKILL.md found notes only (mentions a .env file), nothing it rates as a warning. It is not a guarantee. Review the folder before installing.

What licence does Git Workflow use?

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

About 957 tokens (SKILL.md is roughly 3.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 Workflow?

Skills that share tags, products or a category with Git Workflow: Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars), Light Project Structure (Light0305/Light-skills, 641 stars), Subtree Publish (cat-xierluo/legal-skills, 713 stars) and Finishing a Development Branch (obra/superpowers, 296k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Workflow?

jezweb (a GitHub user) maintains it in jezweb/claude-skills, which has 1,051 GitHub stars. The repository holds 52 skills in this directory. The repository was last updated on October 5, 2026.

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

Install Git Workflow

Facts

At a glance

What it does

When your agent uses it

Example prompts

Requirements

Workflow steps

What it can do on your machine

Tool permissions

Runs code

Network

Credentials

Compatibility

Context cost

Safety

SKILL.md

Git Workflow

PR Preparation

Branch Cleanup

Merge Conflict Resolution

Monorepo Release Tags

.gitignore-First Init

Private Repo License Audit

Files

Compare with similar skills

Similar skills

More from jezweb/claude-skills

Related

Questions about Git Workflow