Working in multiple branches simultaneously in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is a Git branch?

A Git branch is like a separate workspace where you can make changes without affecting the main project. It helps you work on different features or fixes at the same time.

beginner

How do you create a new branch in Git?

Use the command git branch <branch-name> to create a new branch.

beginner

How can you switch between branches in Git?

Use git checkout <branch-name> or git switch <branch-name> to move between branches.

beginner

What does it mean to work in multiple branches simultaneously?

It means you have different branches for different tasks or features, and you switch between them to work on each separately without mixing changes.

beginner

How do you see all branches in your Git repository?

Use git branch to list all branches. The current branch will have a star (*) next to it.

Which command creates a new branch called 'feature'?

A git branch feature

B git create feature

C git new branch feature

D git switch feature

The correct command to create a new branch is git branch feature.

How do you switch to an existing branch named 'bugfix'?

A git branch bugfix

B git checkout bugfix

C git create bugfix

D git init bugfix

Use git checkout bugfix or git switch bugfix to switch branches.

What does the star (*) mean when you run git branch?

A It marks the current branch you are on

B It shows a deleted branch

C It indicates a remote branch

D It means the branch has conflicts

The star (*) shows which branch is currently checked out.

Why work in multiple branches simultaneously?

A To delete old code

B To speed up the computer

C To keep different tasks separate and avoid mixing changes

D To merge all changes automatically

Branches let you work on different tasks without mixing changes.

Which command lists all branches in your repository?

A git status

B git list

C git show branches

D git branch

git branch lists all branches and marks the current one.

Explain how you can work on two different features at the same time using Git branches.

Think about having separate workspaces for each feature.

Describe the steps to create a new branch, switch to it, and check which branch you are currently on.

Remember the commands: git branch, git checkout, git switch.

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