# Git Flow

> >

- **Type:** Skill
- **Install:** `agentstack add skill-kilimcininkoroglu-cli-tweaks-git-flow`
- **Verified:** Yes — security-reviewed for prompt injection and unsafe behavior
- **Seller:** [KilimcininKorOglu](https://agentstack.voostack.com/s/kilimcininkoroglu)
- **Installs:** 0
- **Category:** [Agent Skills](https://agentstack.voostack.com/c/agent-skills)
- **Latest version:** 0.1.0
- **License:** MIT
- **Upstream author:** [KilimcininKorOglu](https://github.com/KilimcininKorOglu)
- **Source:** https://github.com/KilimcininKorOglu/cli-tweaks/tree/main/wrongstack/skills/git-flow

## Install

```sh
agentstack add skill-kilimcininkoroglu-cli-tweaks-git-flow
```

Requires the [AgentStack CLI](https://agentstack.voostack.com/docs/cli). Works with Claude Code, Cursor, and any MCP-compatible agent.

## About

# Git Flow

Manage git branches following a structured workflow with strict validation.

## Usage

```bash
/git-flow feature        # Create feature branch from development
/git-flow bugfix         # Create bugfix branch from development
/git-flow hotfix         # Create hotfix branch from master/main
/git-flow release     # Create release branch from development
/git-flow finish               # Merge current branch to appropriate target
/git-flow status               # Show current branch status and rules
```

## Branch Rules (STRICT)

| Branch Type | Base Branch | Merge Target | Additional |
|-------------|-------------|--------------|------------|
| feature/*   | development | development  | -          |
| bugfix/*    | development | development  | -          |
| hotfix/*    | master/main | master/main  | Also merge to development |
| release/*   | development | master/main  | Also merge to development + tag |

CRITICAL: If attempting to create a branch from wrong base, STOP and show error. Do NOT proceed.

## Context Gathering (MANDATORY FIRST STEP)

Before any operation, gather repository context:

```bash
git status                     # Current state
git branch -a                  # All branches (local + remote)
git branch --show-current      # Current branch name
git remote -v                  # Remote configuration
```

## Auto-Detection Logic

Detect production and development branches automatically:

1. Production branch (in order of priority):
   - `master` if exists
   - `main` if exists
   - Ask user if neither exists

2. Development branch (in order of priority):
   - `development` if exists
   - `develop` if exists
   - `dev` if exists
   - Ask user if none exists

## Commands

### Create Command Preconditions

These apply to every create command (feature/bugfix/hotfix/release) below:

- **Clean working tree required.** If there are uncommitted changes, STOP and ask the user to commit or stash first -- `git checkout ` would otherwise fail or carry the changes onto the new branch.
- **Remote is optional.** If the base branch has no configured remote (`git remote -v` is empty), skip `git pull origin ` and create from the local base -- a missing remote must never abort branch creation (local-only repositories are valid).
- **`--no-checkout`.** Do not switch branches at all: skip both the `git checkout ` and its on-branch `git pull`. Instead update the base ref without moving HEAD, then create from it: `git fetch origin ` followed by `git branch  origin/` when a remote exists, or just `git branch  ` for a local-only base.

### feature 

Create a new feature branch from development branch.

```bash
# Validation
1. Check current branches exist
2. Verify development branch exists
3. Ensure not already on a feature branch with same name

# Execution
git checkout 
git pull origin 
git checkout -b feature/
```

Example: `/git-flow feature user-authentication`
Creates: `feature/user-authentication` from `development`

### bugfix 

Create a new bugfix branch from development branch.

```bash
# Validation
1. Check current branches exist
2. Verify development branch exists

# Execution
git checkout 
git pull origin 
git checkout -b bugfix/
```

Example: `/git-flow bugfix fix-login-error`
Creates: `bugfix/fix-login-error` from `development`

### hotfix 

Create a new hotfix branch from production branch (master/main).

```bash
# Validation
1. Check current branches exist
2. Verify production branch exists

# Execution
git checkout 
git pull origin 
git checkout -b hotfix/
```

Example: `/git-flow hotfix critical-security-patch`
Creates: `hotfix/critical-security-patch` from `master`

### release 

Create a new release branch from development branch.

```bash
# Validation
1. Check current branches exist
2. Verify development branch exists
3. Validate version format (should start with v or be semver)

# Execution
git checkout 
git pull origin 
git checkout -b release/
```

Example: `/git-flow release v1.2.0`
Creates: `release/v1.2.0` from `development`

### finish

Merge current branch to appropriate target(s) based on branch type.

```bash
# Detection
1. Get current branch name
2. Determine branch type (feature/bugfix/hotfix/release)
3. Identify merge target(s)

# Execution varies by type:
```

| Current Branch | Actions |
|----------------|---------|
| feature/* | Checkout development → Merge feature (`--no-ff`) → Delete feature branch |
| bugfix/* | Checkout development → Merge bugfix (`--no-ff`) → Delete bugfix branch |
| hotfix/* | Checkout master → Merge hotfix (`--no-ff`) → Checkout development → Merge hotfix (`--no-ff`) → Delete hotfix branch |
| release/* | Checkout master → Merge release (`--no-ff`) → Tag version → Checkout development → Merge release (`--no-ff`) → Delete release branch |

Before merge:
- Ensure working tree is clean
- Pull latest from target branch (skip if the target has no remote)
- Check for potential conflicts

On conflict or a failed merge:
- STOP -- do NOT delete the source branch (its commits are not yet safely in the target)
- For hotfix/release (two targets): if the SECOND merge (to development) conflicts, the change is now in master but not yet in development -- resolve the conflict and complete the development merge before deleting
- Resolve conflicts manually, then re-run finish

After merge:
- Verify every merge was successful
- Report what was merged where
- Remind the user to push the updated target branch(es): development for feature/bugfix; both master and development for hotfix/release
- For release: also remind to push the tag (`git push origin `, or `git push --tags`)

### status

Show current branch information and applicable rules.

```bash
git branch --show-current
git log --oneline -5
git status
```

Output includes:
- Current branch name and type
- Base branch it should have come from
- Target branch for finish
- Any pending changes

## Validation Rules

NEVER proceed if:
- The base branch does not match the Branch Rules table above (e.g. creating a hotfix from development, or a feature/bugfix from master/main)
- Branch with same name already exists
- Working tree has uncommitted changes (any create or finish command)

## Options

| Option | Description |
|--------|-------------|
| `--no-checkout` | Create branch but stay on current branch |

## Safety Protocol

- NEVER force push
- NEVER delete remote branches automatically
- NEVER skip conflict resolution
- Always merge with `--no-ff` -- the merge commit preserves the branch's history, which is what makes deleting the source branch safe
- Always pull before creating a new branch when the base branch has a remote (skip the pull on local-only repositories)
- Always verify merge success before deleting source branch

## Notes

- Branch names should be kebab-case (e.g., `user-authentication` not `userAuthentication`)
- Version tags should follow semver (e.g., `v1.2.0`)
- After finish, user should manually push changes
- Conflicts must be resolved manually before finish can complete
- IMPORTANT: Always write output in English only, regardless of conversation language

## Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

- **Author:** [KilimcininKorOglu](https://github.com/KilimcininKorOglu)
- **Source:** [KilimcininKorOglu/cli-tweaks](https://github.com/KilimcininKorOglu/cli-tweaks)
- **License:** MIT

Install and usage instructions live in the source repository linked above.

## Pricing

- **Free** — Free

## Security capabilities

Automated source analysis of v0.1.0 — what this tool can access:

- **Network access:** no
- **Filesystem access:** no
- **Shell / process execution:** no
- **Environment & secrets:** no
- **Dynamic code execution:** no

*"Yes" means the capability is present in the source — more access means more to trust, not that it is unsafe.*


## Versions

- **0.1.0** — security scan: passed — Imported from the upstream source.

## Links

- Listing page: https://agentstack.voostack.com/l/skill-kilimcininkoroglu-cli-tweaks-git-flow
- Seller: https://agentstack.voostack.com/s/kilimcininkoroglu
- Browse the marketplace: https://agentstack.voostack.com/browse

---
Listed on AgentStack — the marketplace for AI agent skills and MCP servers. Every listing is security-reviewed. Creators keep 70%.