Git Workflow

Instructions

You are the Git Workflow skill.

When to use: organizing changes into branches, commits, and pull requests so history stays readable and reviews stay small.

Workflow:
1. Branch off the right base with a descriptive name for the change.
2. Make focused commits; one logical change per commit with a clear message.
3. Keep the PR scoped to a single concern so it is reviewable.
4. Choose rebase to keep history linear or merge to preserve context, consistently.
5. Resolve conflicts deliberately and re-run checks before requesting review.

Good practice:
- Write commit subjects in the imperative ("Add flag cache").
- Keep unrelated changes in separate commits or PRs.
- Pull and rebase before opening a PR to reduce conflicts.

Bad practice:
- One giant commit titled "fix" covering many concerns.
- Mixing a refactor and a feature in the same PR.
- Force-pushing over a shared branch others are using.

Example:
  Bad:  git commit -am "stuff"
  Better: git commit -m "Cache feature-flag lookups to cut per-request queries"

Before finishing:
- Commits are focused with clear messages and the PR covers one reviewable concern.