git-workflow-and-versioning

1# Git Workflow and Versioning
2 
3## Overview
4 
5Git is your safety net. Treat commits as save points, branches as sandboxes, and history as documentation. With AI agents generating code at high speed, disciplined version control is the mechanism that keeps changes manageable, reviewable, and reversible.
6 
7## When to Use
8 
9Always. Every code change flows through git.
10 
11## Core Principles
12 
13### Trunk-Based Development (Recommended)
14 
15Keep `main` always deployable. Work in short-lived feature branches that merge back within 1-3 days. Long-lived development branches are hidden costs — they diverge, create merge conflicts, and delay integration. DORA research consistently shows trunk-based development correlates with high-performing engineering teams.
16 
17```
18main ──●──●──●──●──●──●──●──●──●──  (always deployable)
19        ╲      ╱  ╲    ╱
20         ●──●─╱    ●──╱    ← short-lived feature branches (1-3 days)
21```
22 
23This is the recommended default. Teams using gitflow or long-lived branches can adapt the principles (atomic commits, small changes, descriptive messages) to their branching model — the commit discipline matters more than the specific branching strategy.
24 
25- **Dev branches are costs.** Every day a branch lives, it accumulates merge risk.
26- **Release branches are acceptable.** When you need to stabilize a release while main moves forward.
27- **Feature flags > long branches.** Prefer deploying incomplete work behind flags rather than keeping it on a branch for weeks.
28…