git stash apply vs pop - Practice Questions

Challenge - 5 Problems

🧠 Conceptual

intermediate

Difference between git stash apply and git stash pop

Which statement correctly describes the difference between git stash apply and git stash pop?

A <code>git stash apply</code> creates a new stash; <code>git stash pop</code> only shows the stash contents.

B <code>git stash apply</code> reapplies the stash but keeps it in the stash list; <code>git stash pop</code> reapplies and removes the stash from the list.

C <code>git stash apply</code> deletes the stash without applying it; <code>git stash pop</code> applies the stash but keeps it in the list.

D <code>git stash apply</code> permanently deletes all stashes; <code>git stash pop</code> restores the last commit.

💡 Hint

Think about whether the stash remains after applying it.

git stash apply reapplies the changes saved in a stash but keeps the stash saved for possible reuse. git stash pop reapplies the stash and then removes it from the stash list.

💻 Command Output

intermediate

Output after using git stash pop

You have one stash saved. You run git stash pop. What happens to the stash list?

A The stash is reapplied and removed from the stash list, leaving the list empty.

B The stash is reapplied but remains in the stash list.

C The stash list is cleared without applying any changes.

D An error occurs because <code>git stash pop</code> cannot be used with one stash.

💡 Hint

Remember what pop means in everyday life: to take something out.

git stash pop reapplies the latest stash and removes it from the stash list, so the list becomes empty if there was only one stash.

❓ Troubleshoot

advanced

Resolving conflicts after git stash pop

You run git stash pop and get a conflict error. What is the best next step?

A Run <code>git stash apply</code> again to fix the conflicts automatically.

B Run <code>git reset --hard</code> to discard all changes and conflicts.

C Manually resolve the conflicts in the files, then run <code>git add</code> and <code>git commit</code>.

D Run <code>git stash drop</code> to remove the stash and ignore the conflicts.

💡 Hint

Conflicts need manual attention before continuing.

When git stash pop causes conflicts, you must manually fix them, then stage and commit the changes. Other options either ignore conflicts or discard changes.

🔀 Workflow

advanced

Choosing between git stash apply and git stash pop in a workflow

You want to test changes saved in a stash but keep the stash for later use if needed. Which command should you use?

A Use <code>git stash apply</code> to reapply changes without removing the stash.

B Use <code>git stash pop</code> to reapply and remove the stash immediately.

C Use <code>git stash drop</code> to remove the stash without applying it.

D Use <code>git stash clear</code> to remove all stashes before applying.

💡 Hint

Think about whether you want to keep the stash after testing.

git stash apply reapplies the stash but keeps it saved, so you can reuse or pop it later. git stash pop removes it immediately.

✅ Best Practice

expert

Best practice to avoid losing stashed changes accidentally

Which practice helps avoid losing stashed changes when using git stash pop?

A Use <code>git stash clear</code> regularly to keep the stash list clean.

B Always use <code>git stash pop</code> directly to save time and avoid extra commands.

C Never use stashes; commit all changes immediately to avoid confusion.

D Use <code>git stash apply</code> first to test changes, then <code>git stash drop</code> after confirming success.

💡 Hint

Think about how to keep a backup until you are sure changes are good.

Applying the stash first lets you test changes without removing the stash. If all is good, you can then drop the stash. This avoids losing changes if something goes wrong during pop.