Worktrees vs stashing decision in Git - Interactive Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to create a new worktree named 'feature' from the current branch.

Git

git worktree add [1]

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

Astash

Bbranch

Ccommit

Dfeature

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'stash' or 'commit' as the folder name causes confusion.

Forgetting to specify the folder name after 'git worktree add'.

The git worktree add command requires the path for the new worktree. Here, 'feature' is the new directory name for the worktree.

2fill in blank

medium

Complete the command to save your current changes temporarily using stash.

Git

git [1] save

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

Astash

Bbranch

Ccommit

Dcheckout

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'commit' instead of 'stash' saves changes permanently.

Using 'branch' or 'checkout' does not save changes.

The git stash save command saves your current changes temporarily so you can switch branches without committing.

3fill in blank

hard

Fix the error in the command to apply the latest stash.

Git

git stash [1]

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

Aapply

Bcommit

Cpush

Dpop

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'pop' removes the stash after applying.

Using 'push' or 'commit' is incorrect here.

The git stash apply command applies the latest stash without removing it from the stash list.

4fill in blank

hard

Fill both blanks to create a new worktree for branch 'dev' in folder 'dev-tree'.

Git

git worktree add [1] [2]

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

Adev-tree

Bfeature

Cdev

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Swapping folder and branch names.

Using a branch name that does not exist.

The first argument is the folder name for the new worktree, and the second is the branch name to check out there.

5fill in blank

hard

Fill all three blanks to stash changes, switch to branch 'test', and apply the stash.

Git

git [1] save && git checkout [2] && git stash [3]

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

Astash

Btest

Cpop

Dcommit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'commit' instead of 'stash' to save changes.

Using 'apply' instead of 'pop' to remove stash after applying.

First, stash your changes with git stash save. Then switch to branch 'test'. Finally, apply and remove the stash with git stash pop.

Practice

1. What is the main purpose of git stash in Git?

easy

A. Create a new branch in a separate folder

B. Temporarily save changes and clean the working directory

C. Merge two branches automatically

D. Delete untracked files from the repository

Solution

1. Step 1: Understand what git stash does

   git stash saves your current changes temporarily and cleans your working directory so you can switch branches or work on something else without committing.

2. Step 2: Compare with other options

   Creating a new branch in a separate folder is done with worktrees, not stash. Merging branches and deleting untracked files are unrelated commands.

3. Final Answer:

   Temporarily save changes and clean the working directory -> Option B

4. Quick Check:

   Stash = Temporary save changes [OK]

Hint: Stash saves changes fast, worktrees create folders [OK]

Common Mistakes:

• Confusing stash with branch creation
• Thinking stash deletes files permanently
• Mixing stash with merge operations

2. Which command correctly creates a new worktree for branch feature in folder feature-folder?

easy

A. git worktree add feature-folder feature

B. git stash create feature-folder feature

C. git branch add feature-folder feature

D. git checkout -b feature feature-folder

Solution

1. Step 1: Recall the syntax for adding a worktree

   The correct syntax is git worktree add <path> <branch>. So git worktree add feature-folder feature creates a new folder with the branch checked out.

2. Step 2: Check other options for correctness

   git stash create is invalid for this purpose. git branch add is not a valid command. git checkout -b creates a branch but does not create a separate folder.

3. Final Answer:

   git worktree add feature-folder feature -> Option A

4. Quick Check:

   Worktree add = git worktree add [OK]

Hint: Worktree add uses: git worktree add folder branch [OK]

Common Mistakes:

• Using stash commands to create worktrees
• Confusing branch creation with worktree creation
• Incorrect order of arguments in commands

3. You have uncommitted changes on branch main. You want to switch to feature branch without losing changes. What happens if you run git stash then git checkout feature?

medium

A. Git throws an error and refuses to switch branches

B. Changes are lost permanently after checkout

C. Changes are saved temporarily, branch switches cleanly

D. Changes are automatically merged into feature branch

Solution

1. Step 1: Understand what git stash does before switching

   git stash saves your uncommitted changes safely and cleans your working directory so you can switch branches without conflicts.

2. Step 2: Effect of git checkout feature after stash

   Since the working directory is clean after stash, Git switches to feature branch without errors or losing changes. You can later apply the stash.

3. Final Answer:

   Changes are saved temporarily, branch switches cleanly -> Option C

4. Quick Check:

   Stash saves changes, checkout switches branch [OK]

Hint: Stash before checkout saves changes safely [OK]

Common Mistakes:

• Assuming changes are lost after stash
• Expecting automatic merge of stashed changes
• Thinking Git errors on switching with stash

4. You tried to create a worktree with git worktree add feature but got an error. What is the most likely cause?

medium

A. The folder name is missing, causing a syntax error

B. You have uncommitted changes that block worktree creation

C. The branch feature does not exist

D. You forgot to stash changes before adding worktree

Solution

1. Step 1: Check the command syntax

   git worktree add requires two arguments: folder path and branch name. The command git worktree add feature only has one argument, so it is missing the folder name.

2. Step 2: Understand error cause

   Missing folder argument causes Git to throw a syntax error. Uncommitted changes or branch existence issues cause different errors, but syntax error is most likely here.

3. Final Answer:

   The folder name is missing, causing a syntax error -> Option A

4. Quick Check:

   Worktree add needs folder and branch [OK]

Hint: Worktree add needs folder then branch [OK]

Common Mistakes:

• Ignoring missing folder argument
• Assuming uncommitted changes block worktree add
• Confusing stash necessity with worktree creation

5. You want to work on two branches, main and feature, simultaneously without committing unfinished work on main. Which approach is best?

hard

A. Use git stash to save changes on main and switch branches repeatedly

B. Delete the feature branch and work only on main

C. Commit unfinished work on main before switching to feature

D. Create a worktree for feature branch to work in a separate folder

Solution

1. Step 1: Understand the need for parallel work

   You want to work on two branches at the same time without committing unfinished work on main. Stashing and switching repeatedly is slow and error-prone.

2. Step 2: Choose the best tool for parallel branch work

   Worktrees allow you to have multiple branches checked out in different folders simultaneously. This lets you work on main and feature side by side without switching or stashing.

3. Final Answer:

   Create a worktree for feature branch to work in a separate folder -> Option D

4. Quick Check:

   Worktrees = parallel branches in folders [OK]

Hint: Worktrees let you work on branches side-by-side [OK]

Common Mistakes:

• Using stash repeatedly instead of worktrees
• Committing unfinished work prematurely
• Deleting needed branches accidentally