Working in multiple branches simultaneously in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

Switching branches with uncommitted changes

You have uncommitted changes in your current branch. What happens if you run git checkout feature-branch?

A Git refuses to switch branches and shows an error about uncommitted changes.

B Git switches to 'feature-branch' and keeps your uncommitted changes.

C Git automatically commits your changes before switching branches.

D Git deletes your uncommitted changes and switches to 'feature-branch'.

💡 Hint

Think about how Git protects your work when switching branches.

Git prevents switching branches if you have uncommitted changes that would be overwritten. It shows an error to protect your work.

🔀 Workflow

intermediate

Working on two branches simultaneously

You want to work on two branches at the same time without losing your current work. Which Git feature allows you to save your changes temporarily and switch branches?

A git reset

B git stash

C git merge

D git clone

💡 Hint

It saves your changes away temporarily so you can come back to them later.

git stash saves your uncommitted changes so you can switch branches safely and reapply them later.

❓ Configuration

advanced

Creating a new branch and switching to it in one command

Which command creates a new branch named hotfix and switches to it immediately?

A git branch hotfix && git checkout hotfix

B git create hotfix && git switch hotfix

C git switch hotfix

D git checkout -b hotfix

💡 Hint

Look for a single command that does both actions.

git checkout -b hotfix creates and switches to the new branch in one step.

❓ Troubleshoot

advanced

Resolving conflicts when switching branches

You try to switch branches but get a conflict error because of uncommitted changes. What is the best way to resolve this so you can switch branches safely?

A Commit or stash your changes before switching branches.

B Force switch branches with <code>git checkout -f</code> to discard changes.

C Run <code>git merge</code> to combine branches before switching.

D Delete your working directory and clone the repo again.

💡 Hint

Think about preserving your work safely.

Committing or stashing your changes saves them so Git can switch branches without losing work or causing conflicts.

✅ Best Practice

expert

Managing multiple feature branches efficiently

You have multiple feature branches and want to keep them updated with the main branch changes. Which workflow is best to avoid complex conflicts?

A Avoid updating feature branches until all features are complete.

B Merge the main branch into each feature branch only once at the end.

C Regularly rebase each feature branch onto the latest main branch.

D Delete feature branches and recreate them from main when needed.

💡 Hint

Think about keeping your work current and conflicts small.

Rebasing feature branches regularly onto main keeps them up to date and reduces complex merge conflicts later.

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