Skip to content

Commit

Permalink
Typo fix (jennybc#164)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryjohnson09 authored Jul 11, 2020
1 parent b477440 commit e71c161
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion workflows-pull.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ As above, we have just enjoyed a fast-forward merge, made possible by temporaril

If your local changes have some overlap with changes you are pulling, you will, instead get a merge conflict from `git stash pop`. Now you have some remedial work to do. In this case, you have gained nothing by using `git stash` in the first place, which explains my general lack of enthusiasm for `git stash`.

Here how to execute the `git stash` workflow in our example, in the face of conflicts (based on [this Stack Overflow answer](https://stackoverflow.com/a/27382210/2825349)):
Here's how to execute the `git stash` workflow in our example, in the face of conflicts (based on [this Stack Overflow answer](https://stackoverflow.com/a/27382210/2825349)):

``` sh
jenny@2015-mbp ethel $ git stash save
Expand Down

0 comments on commit e71c161

Please sign in to comment.