GitFlow Branching Strategy

Git graph — feature, release, and hotfix workflow

gitGraph LR: commit id: "init" branch develop checkout develop commit id: "setup CI" branch feature/auth checkout feature/auth commit id: "add JWT middleware" commit id: "add login endpoint" commit id: "add refresh tokens" checkout develop merge feature/auth id: "merge auth" branch feature/payments checkout feature/payments commit id: "integrate Stripe" commit id: "add webhook handler" checkout develop merge feature/payments id: "merge payments" branch release/1.0 checkout release/1.0 commit id: "bump version 1.0.0" commit id: "update changelog" checkout main merge release/1.0 id: "v1.0.0" tag: "v1.0.0" checkout develop merge release/1.0 id: "sync release" branch hotfix/token-expiry checkout hotfix/token-expiry commit id: "fix token expiry bug" checkout main merge hotfix/token-expiry id: "v1.0.1" tag: "v1.0.1" checkout develop merge hotfix/token-expiry id: "sync hotfix" branch feature/dashboard checkout feature/dashboard commit id: "add metrics panel" commit id: "add charts" checkout develop merge feature/dashboard id: "merge dashboard" branch release/2.0 checkout release/2.0 commit id: "bump version 2.0.0" checkout main merge release/2.0 id: "v2.0.0" tag: "v2.0.0"