git-workflow

name	git-workflow
description	Guides agents through a clean git workflow: branch naming, commit message conventions, PR creation, and rebase strategies. Activate when the user asks to create a branch, write a commit message, open a PR, or resolve merge conflicts.

Git Workflow

A structured approach to git operations for AI coding agents.

Branch Naming

Use the format type/short-description:

• feat/add-user-auth
• fix/login-redirect
• chore/update-deps

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

Commit Messages

Follow conventional commits:

type(scope): short description

Optional body explaining why, not what.

Keep the subject line under 72 characters. Use imperative mood ("add feature" not "added feature").

Pull Requests

1. Push your branch
2. Open a PR with a clear title following the same type(scope): message format
3. Fill in the description template
4. Request review from the appropriate team

Rebase Strategy

Prefer rebase over merge for feature branches:

git fetch origin
git rebase origin/main

If conflicts arise, resolve them one commit at a time. Never force-push to shared branches.