Working in multiple branches simultaneously in Git - Mini Project: Build & Apply

Working in multiple branches simultaneously

📖 Scenario: You are working on a software project where you need to develop two features at the same time. To keep your work organized, you will use Git branches. This way, you can switch between features without mixing their code.

🎯 Goal: Learn how to create and switch between multiple Git branches to work on different features simultaneously.

📋 What You'll Learn

Create a new branch called feature1 from the current branch

Create another new branch called feature2 from the current branch

Switch to the feature1 branch

Switch to the feature2 branch

List all branches to confirm both branches exist

💡 Why This Matters

🌍 Real World

Developers often work on multiple features or bug fixes at the same time. Using branches keeps their work separate and organized.

💼 Career

Knowing how to manage branches is essential for collaboration and version control in software development jobs.

1

Create the first branch feature1

Use the command git branch feature1 to create a new branch called feature1 from the current branch.

Git

# Use git branch feature1 to create the branch
# Your code here

Hint

Use git branch followed by the branch name to create a new branch.

2

Create the second branch feature2

Use the command git branch feature2 to create another new branch called feature2 from the current branch.

Git

git branch feature1
# Use git branch feature2 to create the second branch
# Your code here

Hint

Repeat the branch creation command with the new branch name.

3

Switch to the feature1 branch

Use the command git checkout feature1 to switch to the feature1 branch.

Git

git branch feature1
git branch feature2
# Use git checkout feature1 to switch branches
# Your code here

Hint

Use git checkout followed by the branch name to switch branches.

4

Switch to the feature2 branch and list branches

Use the command git checkout feature2 to switch to the feature2 branch. Then use git branch to list all branches and confirm both feature1 and feature2 exist.

Git

git branch feature1
git branch feature2
git checkout feature1
# Use git checkout feature2 to switch branches
# Then use git branch to list all branches
# Your code here

Hint

The * shows the current branch. Both branches should be listed.

Practice

1. What is the main purpose of working with multiple branches simultaneously in Git?

easy

A. To develop features independently without affecting the main code

B. To delete all previous commits

C. To merge all branches into one automatically

D. To speed up the internet connection

Solution

1. Step 1: Understand branches in Git

   Branches allow you to work on different versions of your project independently.

2. Step 2: Purpose of multiple branches

   Working on multiple branches lets you develop features or fixes without disturbing the main code.

3. Final Answer:

   To develop features independently without affecting the main code -> Option A

4. Quick Check:

   Branches isolate work = B [OK]

Hint: Branches isolate work so main code stays safe [OK]

Common Mistakes:

• Thinking branches delete commits
• Believing branches merge automatically
• Confusing branches with internet speed

2. Which command correctly creates and switches to a new branch named feature in one step?

easy

A. git checkout feature

B. git switch -c feature

C. git create branch feature

D. git branch feature && git checkout feature

Solution

1. Step 1: Identify command to create and switch branch

   The command git switch -c <branch> creates and switches to the branch in one step.

2. Step 2: Check other options

   git checkout feature switches but does not create if branch doesn't exist. git branch feature && git checkout feature is two commands combined. git create branch feature is invalid syntax.

3. Final Answer:

   git switch -c feature -> Option B

4. Quick Check:

   Create and switch = git switch -c [OK]

Hint: Use 'git switch -c' to create and switch branch fast [OK]

Common Mistakes:

• Using 'git checkout' without creating branch
• Trying invalid commands like 'git create branch'
• Combining commands incorrectly

3. Given the commands below, what will be the output of git branch?

git branch feature
git switch feature
git branch bugfix
git switch bugfix
git branch

medium

A. * bugfix
feature
main

B. * feature
bugfix
main

C. * main
feature
bugfix

D. * bugfix
main
feature

Solution

1. Step 1: Track branch creation and switching

   Branches created: feature, bugfix. Switched last to bugfix, so bugfix is current.

2. Step 2: Understand git branch output

   It lists all branches, marking current with '*'. Order is alphabetical by default: bugfix, feature, main.

3. Final Answer:

   * bugfix feature main -> Option A

4. Quick Check:

   Current branch marked * = C [OK]

Hint: Current branch shows *; branches listed alphabetically [OK]

Common Mistakes:

• Assuming last created branch is current
• Ignoring the * mark for current branch
• Misordering branch list

4. You tried to switch to a branch named dev using git switch dev but got an error: error: pathspec 'dev' did not match any branch. What is the likely cause?

medium

A. The branch dev is already checked out

B. You are not inside a Git repository

C. You have uncommitted changes blocking the switch

D. The branch dev does not exist yet

Solution

1. Step 1: Analyze the error message

   The error says the branch name was not found, meaning it does not exist locally.

2. Step 2: Check other causes

   Not being in a repo gives a different error. Uncommitted changes usually warn differently. Already checked out branch won't error.

3. Final Answer:

   The branch dev does not exist yet -> Option D

4. Quick Check:

   Branch missing = error pathspec not matched [OK]

Hint: Error means branch missing locally, create it first [OK]

Common Mistakes:

• Assuming uncommitted changes cause this error
• Thinking you are outside a Git repo
• Believing branch is already checked out

5. You want to work on two features at the same time: feature1 and feature2. You want to keep your changes separate but test both locally without switching branches repeatedly. Which Git tool helps you do this?

hard

A. Git merge to combine branches

B. Git stash to save changes temporarily

C. Git worktree to create multiple working directories

D. Git rebase to rewrite history

Solution

1. Step 1: Understand the problem

   You want to work on two branches simultaneously without switching back and forth.

2. Step 2: Identify the Git tool

   Git worktree allows multiple working directories linked to different branches, enabling simultaneous work.

3. Step 3: Check other options

   Git stash saves changes temporarily but doesn't allow simultaneous workspaces. Merge and rebase change history or combine branches, not simultaneous work.

4. Final Answer:

   Git worktree to create multiple working directories -> Option C

5. Quick Check:

   Multiple workspaces = git worktree [OK]

Hint: Use git worktree for multiple branches open at once [OK]

Common Mistakes:

• Using stash to try simultaneous work
• Confusing merge with parallel work
• Thinking rebase helps with multiple working copies