Why stashing saves work temporarily in Git - Challenge Your Understanding

Challenge - 5 Problems

🧠 Conceptual

intermediate

What does git stash do with your changes?

You have made changes to files but want to switch branches without committing. What does git stash do with your changes?

A It uploads your changes to the remote repository without committing.

B It commits your changes to the current branch automatically.

C It saves your changes in a temporary area and reverts your working directory to the last commit.

D It deletes your changes permanently from the working directory.

💡 Hint

Think about how you can save work without committing it yet.

git stash temporarily saves your uncommitted changes and cleans your working directory so you can switch branches or work on something else. The changes are not lost but stored safely until you apply them back.

💻 Command Output

intermediate

Output of git stash list after stashing changes

You run git stash after modifying some files. What will git stash list show?

Git

git stash

git stash list

A No stash entries found.

B Untracked files present.

C Error: stash list command not found.

D stash@{0}: WIP on main: <commit-hash> Your last commit message

💡 Hint

What does git stash list show after you stash changes?

After stashing, git stash list shows a list of saved stashes with identifiers like stash@{0} and the branch and commit info where the stash was made.

🔀 Workflow

advanced

Correct sequence to save and restore work using git stash

Arrange the steps in the correct order to save your work temporarily and then restore it later using git stash.

A 1,2,3,4

B 2,1,3,4

C 1,3,2,4

D 2,3,1,4

💡 Hint

Think about saving first, then switching branches, then restoring.

You first save your changes with git stash, then switch branches safely, and later restore your changes with git stash apply to continue working.

❓ Troubleshoot

advanced

Why does git stash apply fail with conflicts?

You stashed changes on branch A, switched to branch B, and ran git stash apply. It failed with conflicts. Why?

A Because the changes in the stash conflict with files on branch B.

B Because <code>git stash apply</code> only works on the original branch.

C Because the stash was deleted automatically after switching branches.

D Because <code>git stash apply</code> requires a commit before applying.

💡 Hint

Think about what happens if your saved changes clash with current files.

If the changes saved in the stash conflict with the current branch's files, git stash apply will show conflicts that you must resolve manually.

✅ Best Practice

expert

Why is it better to use git stash instead of committing unfinished work?

Which reason best explains why using git stash is better than committing unfinished work to the repository?

A Because stashing automatically pushes changes to the remote repository.

B Because stashing keeps the commit history clean by not adding incomplete work.

C Because commits cannot be undone once made, but stashes can be deleted.

D Because stashing merges changes from multiple branches automatically.

💡 Hint

Think about how your project history looks with many small unfinished commits.

Using git stash lets you save work temporarily without cluttering the commit history with incomplete or experimental changes, keeping the project history clean and meaningful.