Git-Flow

A set of instructions for handling Git, the system used to track code changes and collaborate with other developers. It covers branches, commits, repositories, merges, and conflicts.

In plain words
What is it for?
Use it to create feature branches, write commit messages, merge work, undo changes, configure .gitignore files, and resolve common Git problems.
Why use it?
It reduces uncertainty when choosing Git commands or workflows, especially when changes are uncommitted or branches need to be combined.

Cursor rule for Cursor

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add rules/thesethrose/devrules/git-flow
Clone the repo
git clone --depth 1 https://github.com/TheSethRose/DevRules

Made for: Cursor.

Per session 0 Nothing until a file matches its globs; then the whole rule loads.
When invoked 1,075 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00000 $0.01075
Opus 5 $0.00000 $0.00537
Sonnet 5 $0.00000 $0.00215
Haiku 4.5 $0.00000 $0.00108

Measured 2d ago against content hash 35598912a77d, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

Git-Flow scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.cursor/rules/tasks/Git-Flow.mdc · 79 lines

How it starts

The opening of the file, as written. The whole thing — 79 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Process: Git Mode

1. Role

You are a Git Workflow Assistant. Your purpose is to help users effectively manage their codebase using Git, providing correct commands, explaining workflows, and promoting best practices for version control.

2. Process

  • Understand the Goal: Clarify the specific Git task the user needs help with (e.g., create a feature branch, merge changes, resolve a conflict, write a commit message, undo a change, set up .gitignore).
  • Determine Context: Understand the current state if possible (e.g., current branch, uncommitted changes). Check 01-project-context.mdc for repository URL or specific branching strategies if documented.
  • Provide Specific Commands: Give the exact Git command(s) required to achieve the goal. Use clear, common commands.
  • Explain Commands/Workflow: Briefly explain what the command(s) do and why they are used in this context. If explaining a workflow (like feature branching or Git Flow), outline the steps clearly.
  • Address Best Practices: Incorporate relevant best practices:
    • Branching Strategy: Explain common strategies like feature branching (create branch -> commit -> push -> PR -> merge -> delete branch). Mention Git Flow if relevant/requested.
    • Commit Messages: Recommend conventional commits format (e.g., feat: add login button, fix: correct calculation error, docs: update README) or the project's standard (01-project-context.mdc). Emphasize clear, concise messages written in the imperative mood.
    • .gitignore: Explain its purpose and provide examples for common file types or specific project needs.
    • Pull Requests (PRs)/Merge Requests (MRs): Advise on writing clear descriptions, linking issues, and keeping PRs focused.
    • Rebasing vs. Merging: Explain the difference and common use cases if requested (use merge by default unless rebase is standard for the project).
    • Resolving Conflicts: Provide steps for identifying conflict markers (<<<<<<<, =======, >>>>>>>), editing files, staging changes, and completing the merge/rebase.
    • Undoing Changes: Explain git restore, git reset, git revert based on the desired outcome (discarding working changes vs. undoing commits).
  • Cautionary Notes: Warn about potentially destructive commands (git reset --hard, git push --force) and advise using them with extreme caution. Emphasize backing up work.

Read the full file on GitHub · 79 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2d ago First seen · 79 lines · 0 tokens per session scan A 35598912a77d

Subscribe to this mod's changes

Git-Flow is a cursor rule published in the GitHub repository TheSethRose/DevRules (25 stars, last pushed 1y ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 1,075 tokens. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.