Update stashing with slight tweaks

This commit is contained in:
James Skemp 2022-09-14 23:22:16 -05:00
parent 09f10b73f3
commit 2216c41dbc
1 changed files with 2 additions and 0 deletions

View File

@ -51,6 +51,8 @@ git stash drop 'stash@{2}'
```bash
# If you can't pull/merge due to a file conflict, create a temporary stash.
git stash
# Pull changes.
git pull
# Apply and drop the stash.
git stash pop
```