Single branch for production and development
Consider master branch as the single branch for both prod and dev
Steps to create a branch and merge the branch to master
Step 1 checkout to master and create a branch
git checkout master
git checkout -b JinnaBalu/Sample
JinnaBalu/Sample - branch name, choose as you like
NOTE : Good practice to follow some Naming Convention to create branch name but not mandatory JinnaBalu is github user name and JinnaBalu/Sample is branch name**
Step 2 - As you done with some changes to the code, follow
git status
git add --all
git commit -am "message related to changes done in the branch"
git status
git push -u origin JinnaBalu/Sample
-a = all , m = message, push all your changes to your remote or origin branch
Step 3 - Merge newly created branch to master
Step 3.1 - Get latest from master, considering that contributors are more than one member
git checkout master
git pull
Step 3.2 - Merge master to your branch
git checkout JinnaBalu/Sample
git merge --no-ff origin master
You may get conflicts here, if someone modified the same file which you modified
Need to resolve conflicts if any and repeat Step 2
Step 3.3 - Merge your branch to master
git checkout master
git merge --no-ff origin JinnaBalu/Sample
This completes the flow of basic branching
Related Post:
Why Python for Production Services
Vector Aggregator — Transform and Route
Vector Agent — Lightweight Log Collection
HashiCorp Vault — Centralized Secret Management
Vault Auth Methods — Token vs AppRole
Test Coverage and CI Integration
Why Structured Logging Matters
structlog — JSON Logging with Context
Secret Workflow — Local to Production
pytest — Fixtures, Conftest, and Async Testing
Pydantic — Request & Response Validation
Prometheus Metrics — RED Method
Project Structure with pyproject.toml
Auto-Instrumentation for FastAPI
OpenTelemetry — Traces, Spans, and Context
Log Rotation and Disk Management
Jaeger — Visualizing Distributed Traces
Integration Tests for API Endpoints
Health Checks and Readiness Probes
FastAPI — Async-First HTTP Framework
Error Handling & Response Models
Elasticsearch + Kibana — Search and Visualize
Dual Output — Stdout and File Logging
Docker — Containerize from Day One
Dependency Updates and Maintenance
Dependency Auditing with pip-audit
Request-Scoped Logging with Correlation IDs
Environment-Based Config with pydantic-settings
RESTful Route Design with FastAPI Router
K8s Contributor Playground, Learning by Contributing
Adding Try in PWD button to README file
Open JDK docker container commands shell access to the container
AWS EBS Volmes - Create and attach the EBS volume with mounting
Elasticsearch - Dumping documents from multi-node to single node