☁️ SaaS & Cloud · Git Graph
Git Branching Strategy
A GitFlow-style branching model: feature branches into develop, release branches for stabilisation, and hotfixes straight to main.
Drawing diagram…
What this diagram shows
- Features are developed on short-lived branches
- Release branches freeze scope for testing
- Hotfixes go to main and back into develop
Prompt used
Git graph of a GitFlow branching strategy: main has the v1.0 release; develop branches off; two feature branches (login, search) are merged into develop; a release/1.1 branch is cut, a fix is committed and it is merged to main and tagged v1.1 and back into develop; a hotfix branch from main fixes a production bug, merged to main as v1.1.1 and into develop.
Mermaid code
gitGraph commit id: "v1.0" tag: "v1.0" branch develop checkout develop commit id: "setup" branch feature/login checkout feature/login commit id: "login UI" commit id: "login API" checkout develop merge feature/login branch feature/search checkout feature/search commit id: "search" checkout develop merge feature/search branch release/1.1 checkout release/1.1 commit id: "release fixes" checkout main merge release/1.1 tag: "v1.1" checkout develop merge release/1.1 checkout main branch hotfix/1.1.1 checkout hotfix/1.1.1 commit id: "prod bug fix" checkout main merge hotfix/1.1.1 tag: "v1.1.1" checkout develop merge hotfix/1.1.1
Related templates
Kubernetes Microservices Deployment
How a microservices app runs on Kubernetes in the cloud: ingress, namespaces, services with multiple replicas, managed databases and monitoring.
CI/CD Pipeline Flowchart
A typical CI/CD pipeline from a pull request to production: build, tests, security scans, staging deploy, approval and a canary release.
OAuth 2.0 / OpenID Connect Login
The authorization code flow with PKCE used by most modern web and mobile apps to log users in through an identity provider.
Multi-Tenant SaaS Architecture
A B2B SaaS product serving many customer organisations from one platform: tenant-aware services, per-tenant data isolation, billing and admin.
AWS Three-Tier Web Application
The classic three-tier web app on AWS: CloudFront and a load balancer, an autoscaling app tier in private subnets, and a Multi-AZ database.
Event-Driven Architecture with Kafka
Services that talk through events instead of direct calls: an order service publishes events that inventory, payments, notifications and analytics react to.