Working in multiple branches simultaneously in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to switch to an existing branch named 'feature'.

Git

git [1] feature

Drag options to blanks, or click blank then click option'

Acheckout

Bcommit

Cmerge

Dpush

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git commit' instead of 'git checkout'.

Trying to use 'git push' to switch branches.

The git checkout command is used to switch branches.

2fill in blank

medium

Complete the command to create and switch to a new branch named 'bugfix'.

Git

git [1] -b bugfix

Drag options to blanks, or click blank then click option'

Amerge

Bbranch

Ccheckout

Dinit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git branch' alone does not switch branches.

Using 'git merge' to create branches.

The git checkout -b command creates a new branch and switches to it immediately.

3fill in blank

hard

Fix the error in the command to list all branches including remote ones.

Git

git [1] -a

Drag options to blanks, or click blank then click option'

Abranch

Bstatus

Ccheckout

Dlog

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git checkout -a' which is invalid.

Using 'git status -a' which does not list branches.

The git branch -a command lists all local and remote branches.

4fill in blank

hard

Fill both blanks to create a new branch 'release' and push it to the remote repository.

Git

git [1] -b release && git [2] -u origin release

Drag options to blanks, or click blank then click option'

Acheckout

Bpush

Ccommit

Dmerge

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git commit' instead of 'git push' to upload branch.

Using 'git merge' incorrectly here.

First, git checkout -b release creates and switches to the new branch. Then, git push -u origin release pushes it to the remote and sets upstream tracking.

5fill in blank

hard

Fill all three blanks to create a dictionary comprehension that maps branch names to their last commit hash, filtering only branches starting with 'feature'.

Git

{branch[1]: commits[branch] for branch in branches if branch[2]('feature') and commits[branch][3] ''}

Drag options to blanks, or click blank then click option'

A.upper()

B.startswith(

C!=

D==

Attempts:

3 left

💡 Hint

Common Mistakes

Using '==' instead of '!=' to check non-empty commits.

Not using '.startswith(' to filter branches.

The comprehension converts branch names to uppercase keys, filters branches starting with 'feature', and includes only those with a non-empty commit hash.

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