Git Workflows in Real Teams: Choosing the Right Approach

Why Feature Branch Workflow?

• Feature Branch = separate chapter draft
• Code isolation for parallel work
• Safe experimentation without risking main
• Easy to implement for teams of all levels
• Ideal for startups and small projects

Imagine you're working on a book and creating a separate draft for each chapter. That's exactly how the Feature Branch Workflow operates — each new feature lives in an isolated environment. This approach allows teams to work on different tasks simultaneously without creating chaos in the main codebase. You can experiment freely, knowing the main branch remains stable. This is particularly suitable for small teams where speed and flexibility are crucial. When a feature is ready, it undergoes code review before being merged into the main code. The simplicity and efficiency of this approach make it incredibly popular.

Feature Branch Lifecycle

• git checkout -b feature/new-payment
• Commits with clear messages
• git push origin feature/new-payment
• Create pull request
• Code review and merge to main

Let's walk through the entire lifecycle of a feature branch, from creation to merge. We start with the command 'git checkout -b feature/new-payment' — this creates a new branch from main. We work on the task, making commits with clear and detailed descriptions. When the feature is ready, we push the branch to the remote repository and create a pull request. Colleagues review the code, provide feedback, and after addressing all comments, the changes are merged into the main branch. An important rule to remember: one branch per logically complete task. This helps maintain order in the commit history.

# Create branch from main
git checkout main
git pull origin main
git checkout -b feature/new-payment

# Work and commit
echo 'Add payment processing' > payment.js
git add payment.js
git commit -m 'Add payment processing module'

# Push and create PR
git push origin feature/new-payment
# Then create Pull Request via GitHub UI

Creating a Feature Branch in 2 Commands

• Feature Branch Workflow — simple and effective
• Create a branch from the latest main
• git checkout -b feature/new-login
• Branch name reflects the task
• feature/, fix/, docs/ — prefixes for clarity

Let's create a feature branch in practice. First, switch to the main branch and update it: git checkout main double ampersand git pull. Now, create a new branch for our task: git checkout minus b feature slash new-login. The minus b flag tells Git to create a new branch and switch to it immediately. Just two commands — and you're ready to work. Make sure the branch name reflects the task: feature slash, fix slash, or docs slash at the beginning helps quickly understand the branch's purpose. Now you can start making changes.

git checkout main && git pull
# Update the main branch
git checkout -b feature/new-login
# Create and switch to the new branch