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.