Advanced Git for Team Workflows

 

GitFlow Strategy

GitFlow is a structured branching model for managing releases.

Main branches:

  • main → Production-ready code

  • develop → Integration branch

Supporting branches:

  • feature/*

  • release/*

  • hotfix/*

Popularized by Vincent Driessen.

GitFlow Lifecycle

  1. Create feature branch from develop

  2. Merge feature → develop

  3. Create release branch

  4. Merge release → main

  5. Hotfix branches for urgent production issues

Example

git checkout develop
git checkout -b feature/payment-api

After development:

git checkout develop
git merge feature/payment-api

Pull Request (PR) Strategy

Modern teams use PR-based workflow via platforms like:

  • GitHub

  • GitLab

PR Best Practices

1. Small PRs

Easier review and faster approval.

2. Descriptive Title

Example:

Add JWT authentication middleware

3. Code Review Checklist

  • Clean code?

  • Tests added?

  • No secrets committed?

  • Documentation updated?

4. Require Approvals

At least 1–2 reviewers before merge.

Trunk-Based Development (Alternative to GitFlow)

  • Single main branch

  • Short-lived feature branches

  • Frequent merges

Used by companies practicing CI/CD heavily.



Comments

Post a Comment

Popular posts from this blog

Database Integration in FastAPI (SQLAlchemy CRUD)

  Introduction So far, we’ve built APIs without storing data.But real-world applications need a database to: Store user data. Manage products. Persist application state. In this blog, we’ll connect FastAPI with a database using SQLAlchemy and perform CRUD operations . What is SQLAlchemy? SQLAlchemy is a powerful Python ORM (Object Relational Mapper) that allows you to: Interact with databases using Python code. Avoid writing raw SQL queries. Work with models instead of tables. Step 1: Install Dependencies pip install sqlalchemy (For SQLite, no extra driver needed) Project Structure Update app/ ├── main.py ├── database/ │ ├── connection.py ├── models/ │ ├── item.py ├── schemas/ │ ├── item.py ├── routes/ │ ├── item.py Step 2: Database Connection app/database/connection.py from sqlalchemy import create_engine from sqlalchemy . orm import sessionmaker , declarative_base DATABASE_URL = "sqlite:///./test.db" engine = create_engine ( DAT...
Read more

Middleware & CORS in FastAPI

  Introduction As your API grows, you may need to: Log requests Modify responses Handle cross-origin requests This is where Middleware and CORS (Cross-Origin Resource Sharing) come into play.They help control how requests and responses flow through your application. What is Middleware? Middleware is a function that runs: Before a request reaches your route After a response is returned Think of it as a pipeline layer between client and server. Request Flow with Middleware Client → Middleware → Route → Middleware → Response Creating Custom Middleware from fastapi import FastAPI , Request import time app = FastAPI () @ app . middleware ( "http" ) async def log_requests ( request : Request , call_next ): start_time = time . time() response = await call_next ( request ) process_time = time . time() - start_time print ( f"Request: { request . url} | Time: { process_time } " ) return response What This Middle...
Read more

Python Data Handling

Python Data Handling for Beginners In Python, data handling means storing, changing, and using data in different ways. In this post, you will learn: Lists Tuples Dictionaries Sets String Methods Type Conversion 1. Python Lists :Lists store many values in one variable.                fruits = ["apple", "banana", "mango"]                                                                       Method                          Use                                            append()          ...
Read more