It’s easier then you might imagine.
First, start with your forked repo and clone it to your local machine.
git clone [email protected]:myrepo/awesomefiles.git cd awesomefile git remote add upstream [email protected]:jshultz/awesomefiles.git
What we did is first, cloned our local repo to our machine. Then, we added a remote branch called upstream and linked it to the original repo that we forked from.
Now, we’re going to get (in the master branch) the changes from the original repo and rebase them into our master branch. We’ll do that like this:
git fetch upstream git rebase upstream/master
And that’s it. Pretty simple, right?