Update stashing with slight tweaks
This commit is contained in:
parent
09f10b73f3
commit
2216c41dbc
|
@ -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
|
||||
```
|
||||
|
|
Loading…
Reference in New Issue