Merge upstream code into forked repo using SourceTree

https://stackoverflow.com/questions/13273852/how-do-i-update-my-forked-repo-using-sourcetree

First, set up the parent repo:

  1. Open your forked repo in SourceTree.
  2. Select Repository ➫ Repository Settings… in the menu (or press ). ⇧ ⌘ ,
  3. In the Remotes pane, press Add.
  4. Enter any name you like (often upstream or master) and the URL / path to the parent repo.
  5. Press OK, then OK.

Now, to update:

  1. Select Pull in the toolbar.
  2. In the “Pull from repository” drop-down, switch from your fork to the repo you just added.
  3. Press OK.
  4. (Optional) Once you pull, you may want to push any new content up to the server.