Why branches are essential in Git - Why It Works

Introduction

Branches let you work on different versions of your project at the same time. They help keep your main work safe while you try new ideas or fix problems.

When you want to add a new feature without affecting the main project.

When you need to fix a bug but don’t want to stop other work.

When you want to test changes before sharing them with your team.

When multiple people work on the same project and need separate spaces.

When you want to keep your main project stable and clean.

Commands

This command creates a new branch called 'feature-login' so you can work on the login feature separately.

Terminal

git branch feature-login

Expected Output

No output (command runs silently)

Switches your working area to the 'feature-login' branch to start working on it.

Terminal

git checkout feature-login

Expected Output

Switched to branch 'feature-login'

Shows the current branch and any changes you have made but not yet saved.

Terminal

git status

Expected Output

On branch feature-login

nothing to commit, working tree clean

Switches back to the main branch when you want to work on or see the stable project version.

Terminal

git checkout main

Expected Output

Switched to branch 'main'

Combines the changes from 'feature-login' into the main branch after you finish your work.

Terminal

git merge feature-login

Expected Output

Updating abc1234..def5678

Fast-forward

Key Concept

If you remember nothing else from this pattern, remember: branches let you work safely on new ideas without breaking the main project.

Common Mistakes

Making changes directly on the main branch without using a branch.

This can cause problems if the changes have errors or break the project for others.

Always create and switch to a new branch before starting new work.

Forgetting to switch back to the main branch before merging.

Merging on the wrong branch can cause confusion and errors.

Use 'git checkout main' before running 'git merge' to combine changes.

Not checking the status before committing or merging.

You might miss uncommitted changes or conflicts.

Run 'git status' often to see your current branch and changes.

Summary

Create branches to work on new features or fixes separately.

Switch branches to move between different work versions.

Merge branches to combine finished work into the main project.