Skip to content

Commit 2eba073

Browse files
authored
Clarify a sentence about using nbgitpuller
1 parent 9d83593 commit 2eba073

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

resources/prep/jupyterhub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The nbgitpuller link is magical, but it can't detect which profile you are curre
5959
6060
```
6161

62-
Nbgitpuller is nice, because it will automatically merge any changes you make with the changes from the upstream repo on subsequent pulls via a [series of sane rules](https://jupyterhub.github.io/nbgitpuller/topic/automatic-merging.html#topic-automatic-merging).
62+
Nbgitpuller is nice, because it will automatically merge any changes you make with the changes from the upstream repo on subsequent pulls (i.e., when you click the links above again) via a [series of sane rules](https://jupyterhub.github.io/nbgitpuller/topic/automatic-merging.html#topic-automatic-merging).
6363

6464
You can accomplish the same results as nbgitpuller when using `git` directly, but it can take a complicated dance of `git add`, `git stash`, `git pull`, and `git stash apply` to keep your changes and get the changes from upstream.
6565

0 commit comments

Comments
 (0)