How do I update a GitHub forked repository?

Question

I recently forked a project and applied several fixes. I then created a pull request which was then accepted.

A few days later another change was made by another con

Answer 1

Foreword: Your fork is the "origin" and the repository you forked from is the "upstream".

Let's assume that you cloned already your fork to your computer with a command like this:

git clone git@github.com:your_name/project_name.git
cd project_name

If that is given then you need to continue in this order:

1. Add the "upstream" to your cloned repository ("origin"):

   git remote add upstream git@github.com:original_author/project_name.git
   

2. Fetch the commits (and branches) from the "upstream":

   git fetch upstream
   

3. Switch to the "master" branch of your fork ("origin"):

   git checkout master
   

4. Stash the changes of your "master" branch:

   git stash
   

5. Merge the changes from the "master" branch of the "upstream" into your the "master" branch of your "origin":

   git merge upstream/master
   

6. Resolve merge conflicts if any and commit your merge

   git commit -am "Merged from upstream"
   

7. Push the changes to your fork

   git push
   

8. Get back your stashed changes (if any)

   git stash pop
   

9. You're done! Congratulations!

GitHub also provides instructions for this topic: Syncing a fork