Updating Your Repo With Changes

Open up your Git terminal If you haven’t already, add Kelly’s repo as a remote: git remote add upstream

NOTE: You can get the repo link by visiting Kelly’s repo on GitHub and click on “Clone or Download” and then copy the link. Probably better to get the SSH link if you have SSH working.

Then, do this:

git checkout master
git pull upstream master

This will pull the changes from Kelly’s remote repo into your local repo.

Then do this:

git push

This will push the changes (which are now in your local repo) into your remote (forked) repo.

To update a local branch with changes from your local master, do this:

Checkout your branch E.g. git checkout 99-some-feature Rebase onto master - this basically merges new stuff from master into your feature branch (without creating a merge commit)

git rebase master

Push

git push -f

Guide done by Zain.