What is the difference between git branch and git checkout -b?

git branch creates a new branch but stays on the current branch. git checkout -b creates the branch AND switches to it immediately. The newer command git switch -c does the same thing as checkout -b in a more explicit way.

What is the main (or master) branch?

It is the primary branch of your project, the one that contains stable, production-ready code. By convention, you never work directly on it: you create feature branches and merge them into main once they are finished and validated.

How many branches can I have at the same time?

As many as you want! Git is very efficient with branches. In practice, a team may have dozens of active branches. The important thing is to name them clearly and delete them once merged.

What happens if I switch branches with uncommitted changes?

Git will warn you and refuse the switch if the changes would create a conflict. You have two options: commit your changes, or temporarily set them aside with git stash to retrieve them later.

How do I delete a branch?

Locally: git branch -d for a merged branch, git branch -D to force deletion. Remotely: git push origin --delete . Always delete merged branches to keep a clean repository.

Git branch explained: understanding branches

Branches are at the heart of Git. They let you work on multiple features in parallel without risking breaking the main code. Here is everything you need to know.

Practice branches View the full glossary

gitquest — enquête

What is a Git branch?

A branch is an independent line of development. Imagine a tree: the trunk is your main branch (main), and each branch stems from the trunk to develop a feature without touching the stable code.

Technically, a Git branch is simply a pointer to a commit. When you create a branch, Git creates a new pointer. That's why Git branches are so fast and lightweight: no file copying, just a pointer.

When your feature is finished and tested, you merge (merge) your branch into the main branch. The code rejoins the trunk.

Why use branches?

Branches are essential for working cleanly, whether in a team or solo.

Protect stable code

The main branch always stays functional. Experiments happen on separate branches.

Work as a team

Each developer works on their own branch. No risk of overwriting each other's work.

Develop in parallel

Work on a feature, fix a bug, and test an idea — each on its own branch, at the same time.

Facilitate code review

One branch = one feature = one pull request. Code review is clear and focused.

Create

Create a new branch

The command git branch <name> creates a branch but does not switch to it. To create and switch in one command, use git checkout -b <name>.

The new branch starts from the current commit (HEAD). All commits you make afterward will belong to this branch, not to main.

gitquest - create a branch

# Create and switch to a new branch

$git branch feature/login

$git checkout feature/login

Switched to branch 'feature/login'

# Or in a single command:

$git checkout -b feature/login

Switched to a new branch 'feature/login'

gitquest - navigate

# Navigate between branches

$git switch feature/login

Switched to branch 'feature/login'

$git switch main

Switched to branch 'main'

# git switch is clearer than git checkout

$git switch -c feature/contact

Switched to a new branch 'feature/contact'

Navigate

Switch between branches

The git switch (or git checkout) command lets you move from one branch to another. When you switch, Git updates the files in your working directory to match the target branch's state.

git switch is the newer and recommended command. It is more explicit than git checkout which does too many different things.

List

View all branches

git branch without arguments lists local branches. The asterisk (*) indicates the branch you are currently on.

Add the -a flag to also see remote branches (those on GitHub, GitLab, etc.), or -r for remote branches only.

gitquest - list branches

# List all branches

$git branch

develop

feature/login

feature/cart

* main

# The asterisk (*) indicates the current branch

$git branch -a

# -a: also shows remote branches

Branch naming conventions

Good naming makes the repository readable and branches identifiable at a glance. Here are the most widely used conventions in the industry.

feature/

New feature

feature/add-cart

fix/

Bug fix

fix/header-responsive

hotfix/

Urgent production fix

hotfix/auth-vulnerability

refactor/

Refactoring without functional changes

refactor/user-component

release/

Preparing a production release

release/v2.1.0

test/

Experimentation or testing

test/new-api

Visualizing branches: the mental model

Imagine a tree seen from above. Each branch stems from a point on the trunk and develops independently.

main ────────●────────●────────●────────●→

╲

feature/login ──●────●────●

╲

fix/typo ──●

Each ● represents a commit. Branches stem from an existing commit and evolve independently until they are merged.

Part of the Git Branching Workflow guide

Related commands

git merge

Merge branches together

git rebase

Reorganize the history

git checkout / switch

Switch branches

GitQuest is created by Anaïs (nouvelle fenêtre), web developer and head of education, specializing in tech training and digital accessibility.

Questions fréquentes

Ready to master Git branches?

Practice creating, navigating, and merging branches in GitQuest investigations. It's free.

Get started now