From e71c161ac8517d07d9a84a489d14684b93a02748 Mon Sep 17 00:00:00 2001 From: Ryan Johnson Date: Sat, 11 Jul 2020 02:28:28 -0400 Subject: [PATCH] Typo fix (#164) --- workflows-pull.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows-pull.Rmd b/workflows-pull.Rmd index 9a65b5a0..737840c5 100644 --- a/workflows-pull.Rmd +++ b/workflows-pull.Rmd @@ -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