Video: Stash work and resume it safely

Video transcript

The narration of the video, cue by cue.

1. Set unfinished work aside, and bring it back safely.
2. A stash holds your edits on a shelf, and cleans the work tree.
3. Apply brings the changes back and keeps the entry. Pop removes it, if clean.
4. Make a branch with one commit, then edit the file and add a new note.
5. In the changes list: one modified file, and one new file.
6. Write down the current commit. It must not move.
7. Open the palette and run Stash Changes.
8. Give it a message you will recognize.
9. Only staged is off. Include untracked is on. Keep staged is off.
10. Ignored files are a different category, and do not go in.
11. Choose Stash, and wait for the notice.
12. The changes list is empty, and the stash is listed.
13. The tooltip says untracked files are included. Show Stash lists its files.
14. Right-click the stash, and choose Apply Stash.
15. The notice says the stash is still in the list.
16. Both are back: the edit, and the note.
17. The branch tip is the same commit. No stash command made one.
18. And the stash is still on the shelf.
19. In the terminal, git stash push with include untracked, then the status.
20. The list shows the message, with the branch name first.
21. git stash apply brings both back.
22. The stash is still listed, and HEAD is the same.
23. Without that option, the note stays on disk.
24. In the conflict copy, we commit another change first, and then pop.
25. The warning says the stash is kept. The file is conflicted.
26. Resolve the file, and mark it resolved. The stash is still there.
27. Delete the stash only when you are sure. Or give it its own branch.
28. Practice: prove clean, restored, and kept. Then predict without include untracked.
29. Next, learn what reset soft, mixed and hard each change.