git stash apply vs pop - Interactive Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to save your current changes to a stash.

Git

git stash [1]

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

Aapply

Bsave

Cpush

Dpop

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'apply' or 'pop' instead of the command to save changes.

Using 'save' which is deprecated.

The git stash push command saves your current changes to a new stash.

2fill in blank

medium

Complete the command to reapply the latest stash without removing it.

Git

git stash [1]

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

Aapply

Bpush

Cpop

Ddrop

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'pop' which removes the stash after applying.

Using 'drop' which deletes the stash without applying.

The git stash apply command reapplies the latest stash but keeps it in the stash list.

3fill in blank

hard

Fix the error in the command to reapply and remove the latest stash.

Git

git stash [1]

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

Aapply

Bsave

Cpush

Dpop

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'apply' which does not remove the stash.

Using 'push' or 'save' which are for saving changes.

The git stash pop command reapplies the latest stash and removes it from the stash list.

4fill in blank

hard

Fill both blanks to complete the command that shows the stash list and then removes the latest stash.

Git

git stash [1] && git stash [2]

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

Alist

Bpop

Capply

Ddrop

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'apply' instead of 'pop' which does not remove the stash.

Using 'drop' first which deletes stash without applying.

git stash list shows all stashes, and git stash pop reapplies and removes the latest stash.

5fill in blank

hard

Fill all three blanks to create a dictionary comprehension that maps stash names to their index if the index is less than 3.

Git

stash_dict = [1]: [2] for [3] in range(5) if [2] < 3}

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

A"stash_" + str(i)

Bi

Dstash

Attempts:

3 left

💡 Hint

Common Mistakes

Using the same variable name for key and loop variable incorrectly.

Not converting index to string for key.

This comprehension creates keys like 'stash_0', 'stash_1', 'stash_2' with values 0, 1, 2.

Practice

1. What is the main difference between git stash apply and git stash pop?

easy

A. git stash apply only shows the stash content, git stash pop applies it.

B. git stash apply deletes the stash after applying, git stash pop keeps it.

C. git stash apply restores changes but keeps the stash saved, while git stash pop restores changes and removes the stash.

D. git stash apply creates a new stash, git stash pop deletes all stashes.

Solution

1. Step 1: Understand git stash apply behavior

   This command restores the saved changes from the stash but keeps the stash entry intact for future use.

2. Step 2: Understand git stash pop behavior

   This command restores the changes and then removes the stash entry, cleaning up automatically.

3. Final Answer:

   git stash apply restores changes but keeps the stash saved, while git stash pop restores changes and removes the stash. -> Option C

4. Quick Check:

   Apply keeps stash, pop removes stash [OK]

Hint: Apply keeps stash, pop removes stash after applying [OK]

Common Mistakes:

• Thinking apply deletes stash
• Confusing pop with apply
• Believing apply only previews changes
• Assuming pop keeps stash

2. Which of the following is the correct syntax to restore stash changes and remove the stash entry?

easy

A. git stash apply

B. git stash pop

C. git stash save

D. git stash list

Solution

1. Step 1: Identify command to restore and remove stash

   git stash pop restores the changes and deletes the stash entry.

2. Step 2: Confirm other commands

   git stash apply restores but keeps stash; git stash save creates stash; git stash list shows stashes.

3. Final Answer:

   git stash pop -> Option B

4. Quick Check:

   Pop restores and removes stash [OK]

Hint: Pop restores and deletes stash, apply keeps stash [OK]

Common Mistakes:

• Using apply instead of pop to remove stash
• Confusing save with pop
• Trying to remove stash with list
• Using wrong command syntax

3. Given this sequence of commands:

git stash save "work in progress"
git stash apply

What happens to the stash list after these commands?

medium

A. The stash list still contains the saved stash.

B. The stash list is empty.

C. The stash list contains two identical stashes.

D. The stash list is deleted.

Solution

1. Step 1: Save a stash

   git stash save "work in progress" creates a stash entry and saves changes.

2. Step 2: Apply stash without removing

   git stash apply restores changes but keeps the stash entry intact.

3. Final Answer:

   The stash list still contains the saved stash. -> Option A

4. Quick Check:

   Apply keeps stash in list [OK]

Hint: Apply restores but stash remains in list [OK]

Common Mistakes:

• Assuming apply removes stash
• Thinking stash list duplicates
• Believing stash list clears automatically
• Confusing apply with pop

4. You ran git stash pop but got a conflict error. What should you do to fix this?

medium

A. Run git stash apply again to fix conflicts automatically.

B. Run git stash pop again without resolving conflicts.

C. Delete the stash file manually from .git folder.

D. Manually resolve conflicts, then run git stash drop to remove stash.

Solution

1. Step 1: Understand conflict on pop

   git stash pop applies changes and removes stash, but conflicts can occur if changes clash.

2. Step 2: Resolve conflicts and clean stash

   Manually fix conflicts, then remove stash with git stash drop if pop did not remove it due to conflict.

3. Final Answer:

   Manually resolve conflicts, then run git stash drop to remove stash. -> Option D

4. Quick Check:

   Fix conflicts, then drop stash manually [OK]

Hint: Resolve conflicts manually, then drop stash [OK]

Common Mistakes:

• Rerunning pop without fixing conflicts
• Assuming apply fixes conflicts automatically
• Deleting stash files manually
• Ignoring conflicts and continuing

5. You want to test changes saved in a stash without removing it, then later clean up if everything works. Which sequence of commands should you use?

hard

A. git stash apply; if okay, git stash drop

B. git stash pop; if okay, git stash apply

C. git stash drop; then git stash apply

D. git stash list; git stash pop

Solution

1. Step 1: Use git stash apply to test changes

   This command restores changes but keeps stash, so you can test without losing the stash.

2. Step 2: Remove stash if tests pass

   If changes work well, run git stash drop to delete the stash and clean up.

3. Final Answer:

   git stash apply; if okay, git stash drop -> Option A

4. Quick Check:

   Apply to test, drop to clean [OK]

Hint: Apply to test, drop to remove stash later [OK]

Common Mistakes:

• Using pop first and losing stash before testing
• Dropping stash before applying
• Applying stash twice unnecessarily
• Confusing list with apply or pop