Skip to content

Git Branches

In this lesson you will learn branches in Git, why it matters within branches, and how to use it correctly with clear, copy-ready examples.

Branches Overview

Branches is something you will reach for often in Git. It keeps your workflow predictable and makes your intent obvious to reviewers and teammates.

When you learn branches properly, you avoid the guesswork that leads to mistakes and rework. The example below shows the shape you will use in most real Git projects.

# create and switch to a new branch
git switch -c feature/login

# list branches
git branch

# switch back to main
git switch main

# delete a merged branch
git branch -d feature/login

Branches let you develop features in isolation before merging them back into main.

Branches Example

git add <files>
git commit -m "message"
git push origin <branch>
  • Start from a minimal Branches example and grow it only as needed.
  • Keep things explicit so Branches behaves the same for everyone on the team.
  • Name things clearly so teammates understand your Branches at a glance.
  • Verify Branches works as expected before relying on it in important work.

Git Cheatsheet

Handy Git command reference related to branches.

Task Command Purpose
Status git status See what changed
Stage git add <file> Prepare changes to commit
Commit git commit -m "msg" Record a snapshot
Branch git switch -c name Create and switch branch
Merge git merge branch Combine histories
Push git push origin main Share commits
Pull git pull origin main Get others' commits
Undo git restore <file> Discard local changes

How Branches Works in Git

Branches builds on Git's model of snapshots and references. Every commit points to a full snapshot of your project, and branches are simply lightweight pointers to commits.

Branches let you develop features in isolation before merging them back into main.

  • The working directory, staging area, and repository are Git's three main areas.
  • Commits are immutable snapshots linked to their parents.
  • Branches and tags are just pointers to commits.
  • Remotes are copies of the repository you sync with.

Practical Guidance for Branches

On real teams, branches works best with small, focused commits and clear messages. Commit often, write descriptive messages, and pull before you push to avoid surprises.

Habit Why it helps
Small commits Easier to review and revert
Clear messages History explains the why
Branch per feature Isolates work in progress
Pull before push Avoids avoidable conflicts

Common Mistakes

  • Copying branches commands or snippets without understanding what each part does.
  • Skipping edge cases and error handling when using branches.
  • Not verifying the result of branches before moving on.
  • Over-complicating branches before you actually need the extra flexibility.

Key Takeaways

  • Branches is a core part of working effectively with Git.
  • Start small and keep branches focused on a single goal.
  • Apply consistent patterns so branches scales across your project.
  • Practise and document branches to keep your workflow maintainable.

Pro Tip

Practise branches on a throwaway project first. It is far cheaper to learn Git mistakes there than on important work.