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.