Why branches are essential in Git - Visual Breakdown

Process Flow - Why branches are essential

Start on main branch

↓

Create new branch

↓

Work on feature independently

↓

Test changes safely

↓

Merge back to main

↓

Main branch updated without breaking code

Branches let you work on new ideas separately, so the main project stays safe and stable.

Execution Sample

Git

git checkout -b feature
# work on feature
# test changes
# git checkout main
# git merge feature

Create a branch, work on it, test safely, then merge back to main.

Process Table

Step	Command	Action	Branch State	Result
1	git checkout -b feature	Create and switch to 'feature' branch	main + feature (new branch created)	Ready to work on feature separately
2	Make changes	Edit files on 'feature' branch	feature updated	Changes isolated from main
3	Test changes	Run tests on 'feature' branch	feature tested	Safe to verify without affecting main
4	git checkout main	Switch back to main branch	main unchanged	Main branch remains stable
5	git merge feature	Merge feature branch into main	main updated with feature	Main branch now has new feature
6	Delete feature branch (optional)	Remove feature branch after merge	main only	Clean workspace
7	End	No more changes on feature branch	main stable	Project updated safely

💡 Feature branch merged and main branch updated safely without breaking code

Status Tracker

Branch	Start	After Step 1	After Step 2	After Step 3	After Step 4	After Step 5	Final
main	initial commit	initial commit	initial commit	initial commit	initial commit	updated with feature	updated with feature
feature	does not exist	created from main	changes made	tested	switched away	merged into main	deleted or kept

Key Moments - 3 Insights

Why do we create a branch instead of working directly on main?

Creating a branch lets you try new things without risking the main branch. See execution_table step 1 and 2 where feature branch is created and changed separately.

What happens if tests fail on the feature branch?

You can fix problems on the feature branch without affecting main. This is shown in step 3 where testing happens safely on feature.

Why switch back to main before merging?

You merge into the branch you want to update. Switching back to main (step 4) ensures main is ready to receive changes from feature (step 5).

Visual Quiz - 3 Questions

Look at the execution_table, what is the branch state after step 3?

A feature branch does not exist yet

B main branch has new feature merged

C feature branch is tested and updated

D main branch is deleted

💡 Hint

Check the 'Branch State' column at step 3 in execution_table

At which step does the main branch get updated with the new feature?

A Step 2

B Step 5

C Step 1

D Step 4

💡 Hint

Look for 'main updated with feature' in the Result column

If you skip switching back to main before merging, what would happen?

A Merge would update feature branch instead of main

B Merge would fail because you are not on main

C Nothing changes, merge works the same

D Feature branch gets deleted automatically

💡 Hint

Refer to step 4 and 5 about branch switching and merging

Concept Snapshot

Branches let you work on new features separately from main.
Create a branch with 'git checkout -b branchname'.
Work and test safely on the branch.
Switch back to main and merge with 'git merge branchname'.
This keeps main stable and avoids breaking code.

Full Transcript

Branches in git are essential because they let you work on new features or fixes without changing the main project directly. You start on the main branch, create a new branch for your work, and make changes there. You can test your changes safely on this branch. When ready, you switch back to main and merge your feature branch. This process keeps the main branch stable and avoids breaking the project. The execution table shows each step: creating the branch, making changes, testing, switching back, and merging. Variables track the state of branches over time. Key moments clarify why branching is safer and how merging works. The quiz checks understanding of branch states and merge steps.

Practice

1. Why are branches important in Git?
git branch feature creates a new branch. What is the main reason to use branches?

easy

A. To work on new features without affecting the main code

B. To delete files from the project

C. To speed up the computer

D. To permanently remove old versions

Solution

1. Step 1: Understand what branches do

   Branches let you create a separate copy of the project to work on changes safely.

2. Step 2: Identify the main purpose of branches

   Branches help keep new work separate so the main project stays stable.

3. Final Answer:

   To work on new features without affecting the main code -> Option A

4. Quick Check:

   Branches isolate work = A [OK]

Hint: Branches isolate new work from main code [OK]

Common Mistakes:

• Thinking branches delete files
• Believing branches speed up the computer
• Confusing branches with deleting old versions

2. Which Git command correctly creates a new branch named dev?

easy

A. git create branch dev

B. git branch dev

C. git new dev

D. git start branch dev

Solution

1. Step 1: Recall Git branch creation syntax

   The correct command to create a branch is git branch branch_name.

2. Step 2: Match the command with options

   Only git branch dev matches the correct syntax.

3. Final Answer:

   git branch dev -> Option B

4. Quick Check:

   Correct branch command = C [OK]

Hint: Use 'git branch <branch_name>' to create branches [OK]

Common Mistakes:

• Using 'git create branch' which is invalid
• Trying 'git new' which is not a Git command
• Using 'git start branch' which does not exist

3. What will be the output of the following commands?

git branch
git checkout -b feature1
git branch

medium

A. * master\n feature1

B. feature1\n* master

C. * feature1\n master

D. master\n* feature1

Solution

1. Step 1: Understand initial branch list

   First git branch shows * master (assuming on master).

2. Step 2: Analyze git checkout -b feature1

   This creates and switches to feature1 branch, so next git branch shows * feature1 as current.

3. Step 3: Check output order

   Branches are listed in the order they were created, so master then feature1. The star (*) marks current branch.

4. Final Answer:

   master\n* feature1 -> Option D

5. Quick Check:

   Current branch marked * = B [OK]

Hint: Star (*) marks current branch in 'git branch' output [OK]

Common Mistakes:

• Confusing which branch is current
• Mixing order of branches in output
• Ignoring the star (*) symbol

4. You ran git checkout feature but got an error: error: pathspec 'feature' did not match any file(s) known to git. What is the likely problem?

medium

A. The branch 'feature' does not exist yet

B. You have uncommitted changes blocking checkout

C. You typed the command in the wrong folder

D. Git is not installed properly

Solution

1. Step 1: Understand the error message

   The error says the branch name 'feature' is unknown to Git, meaning it does not exist.

2. Step 2: Identify the cause

   Trying to checkout a branch that was never created causes this error.

3. Final Answer:

   The branch 'feature' does not exist yet -> Option A

4. Quick Check:

   Unknown branch error = D [OK]

Hint: Check if branch exists before checkout [OK]

Common Mistakes:

• Assuming uncommitted changes cause this error
• Thinking Git installation is broken
• Ignoring the branch name spelling

5. You want to add a new feature without disturbing the main project. Which sequence of commands correctly uses branches to do this safely?

hard

A. git merge new-featuregit branch new-featuremake changesgit commit -m 'Add feature'

B. git checkout mainmake changesgit commit -m 'Add feature'git branch new-featuregit merge main

C. git branch new-featuregit checkout new-featuremake changesgit commit -m 'Add feature'git checkout maingit merge new-feature

D. git commit -m 'Add feature'git branch new-featuregit checkout new-featuregit merge main

Solution

1. Step 1: Create and switch to a new branch

   Use git branch new-feature then git checkout new-feature to isolate work.

2. Step 2: Make changes and commit on new branch

   Make your changes and commit them safely on new-feature.

3. Step 3: Switch back and merge changes

   Switch to main and merge new-feature to add the feature safely.

4. Final Answer:

   git branch new-feature
   git checkout new-feature
   make changes
   git commit -m 'Add feature'
   git checkout main
   git merge new-feature -> Option C

5. Quick Check:

   Branch, commit, merge sequence = A [OK]

Hint: Create branch, commit changes, then merge back [OK]

Common Mistakes:

• Committing on main before branching
• Merging before making changes
• Switching branches in wrong order