Finalise synching with upstream section

Author: annakrystalli

content/03-collaborative_github_basics/12-pull-upstream-changes.en.md

@@ -3,7 +3,7 @@ title: Pulling Upstream Changes
 weight: 12
 ---
 
-Now that everyone has contributed to the [**RSE-Sheffield** repository](https://github.com/RSE-Sheffield/collaborative_github_exercise) (the **upstream** repository), the `params/` folder contains a number of files, one for each successful pull request.
+Now that everyone has contributed to the [**r-rse** repository](https://github.com/r-rse/evolottery) (the **upstream** repository), the `params/` folder contains a number of files, one for each successful pull request.
 
 This is also clear form the commit locator
 
@@ -20,33 +20,29 @@ On the left side menu bar, hover over the **<i class="fa fa-cloud" aria-hidden="
 
 <img src="/images/edit-evo-5a.png" />
 
-This should open the **<i class="fa fa-cloud" aria-hidden="true"></i> Add Remote** Tab. Select the **`RSE-Sheffield/collaborative_github_exercise`** repository from the **GitHub Repo** dropdown menu and click the {{% button %}}**Add Remote**{{% /button %}}  button.
+This should open the **<i class="fa fa-cloud" aria-hidden="true"></i> Add Remote** Tab. Select the **`r-rse/evolottery`** repository from the **GitHub Repo** dropdown menu and click the {{% button %}}**Add Remote**{{% /button %}}  button.
 
 <img src="/images/edit-evo-5b.png" />
 
-Once added, the RSE-Sheffield repository will be visible under the **<i class="fa fa-cloud" aria-hidden="true"></i> REMOTE** menu
+Once added, the r-rse repository will be visible under the **<i class="fa fa-cloud" aria-hidden="true"></i> REMOTE** menu
 
 <img src="/images/edit-evo-5c.png" />
 
 
 ### Pull upstream changes
 
-To pull the upstream changes from the **`RSE-Sheffield`** repository, **grab** the **`RSE-Sheffield`** button from the history panel and drag it over to your <i class="fa fa-laptop" aria-hidden="true"></i> local `master` branch until a **<i class="fas fa-crosshairs"></i>** icon appears next to it and **drop**.
+To pull the upstream changes from the **`r-rse`** repository, **grab** the **`r-rse`** button from the history panel and drag it over to your <i class="fa fa-laptop" aria-hidden="true"></i> local `main` branch until a **<i class="fas fa-crosshairs"></i>** icon appears next to it and **drop**.
 
 <img src="/images/gk-pull-upstream.gif" />
 
-Once you drop it onto the <i class="fa fa-laptop" aria-hidden="true"></i> local `master` branch successfully, a pop up menu will appear. Select **Fast-forward master to RSE-Sheffield/master**. That ensures that you **do not create a circular commit of your initial commit** to the upstream repo when you are merging it back into your <i class="fa fa-laptop" aria-hidden="true"></i> local repo. Find out more about [fast-forward git merging](https://ariya.io/2013/09/fast-forward-git-merge).
+Once you drop it onto the <i class="fa fa-laptop" aria-hidden="true"></i> local `main` branch successfully, a pop up menu will appear. Select **Fast-forward main to r-rse/main**. That ensures that you **do not create a circular commit of your initial commit** to the upstream repo when you are merging it back into your <i class="fa fa-laptop" aria-hidden="true"></i> local repo. Find out more about [fast-forward git merging](https://ariya.io/2013/09/fast-forward-git-merge).
 
 <img src="/images/gk-fast-forward.png" />
 
-Once the merge is complete, your <i class="fa fa-laptop" aria-hidden="true"></i> local `master` will now be showing as synched with the **`RSE-Sheffield`** remote
+Once the merge is complete, your <i class="fa fa-laptop" aria-hidden="true"></i> local `main` will now be showing as synched with the **`r-rse`** remote and you will have copies of all the files contributed in your `params/` folder! :tada:
 
 <img src="/images/gk-local-synched.png" />
 
-and you will have copies of all the files contributed in your `params/` folder! :tada:
-
-<img src="/images/gk-local-synched-files.png" />
-
 
 
 ### Synch **origin** remote