git stash apply vs pop - Quick Revision & Key Differences

Recall & Review

beginner

What does git stash apply do?

git stash apply takes the changes saved in the stash and applies them to your current working directory, but it keeps the stash entry saved for later use.

beginner

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

git stash apply applies the stash but keeps it saved, while git stash pop applies the stash and then removes it from the stash list.

beginner

When would you use git stash pop instead of git stash apply?

You use git stash pop when you want to apply the changes and also clean up by removing the stash entry immediately.

intermediate

What happens if there is a conflict when you run git stash apply or git stash pop?

Git will show conflict markers in the files. You must resolve conflicts manually before continuing.

beginner

How can you see the list of all stashed changes?

Use git stash list to see all saved stashes with their names and descriptions.

What does git stash pop do?

A Deletes all stashes without applying

B Applies the stash and removes it from the stash list

C Applies the stash but keeps it saved

D Creates a new stash

git stash pop applies the changes and removes the stash entry.

Which command keeps the stash after applying changes?

A git stash apply

B git stash clear

C git stash drop

D git stash pop

git stash apply applies changes but keeps the stash saved.

If you want to apply stash changes but keep them for later, which command do you use?

A git stash pop

B git stash drop

C git stash list

D git stash apply

git stash apply applies changes without removing the stash.

What should you do if conflicts appear after applying a stash?

A Manually resolve conflicts

B Delete the conflicting files

C Ignore and continue

D Run <code>git stash clear</code>

You must manually resolve conflicts before continuing.

How do you view all saved stashes?

A git stash apply

B git stash show

C git stash list

D git stash pop

git stash list shows all saved stashes.

Explain the difference between git stash apply and git stash pop.

Think about whether the stash remains after applying.

Describe what happens when there is a conflict after applying a stash and how to handle it.

Conflicts are like disagreements in changes that need fixing.

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