Step 8 – Fetch & Merge

Now the files in the “official” repo have been changed, we need to fetch them down to our local machine and merge them in with our own.

The first step is to switch GitHub Desktop’s current branch to the default branch in the upstream repo. Note that (for some obscure reason) this is not shown as “upstream/develop”, but is just called “develop”.

Select this from the list to make it the current branch; it should show that there are commits that need to be pulled from upstream. Click the button to do this.

Note that this process only updates your local version of the “official” default repo. You will still need to merge this into your default repo. So change the active branch back to your own default branch by selecting it from the dropdown list…

…then click on the Branch option in the top menu and choose Merge into current branch.

  1. You need to select the default upstream repo to merge into your default local repo… in this case we are merging develop into develop-sc.
  2. Check the text in the merge button is correct and then click to merge.

Now local is back in sync with upstream. The only player still behind the game is origin.