Just wanted to share how I do my command-line based "syncing" of forks (making sure project repo updates from the "upstream" repository is pulled into your own i.e. your fork).
This helps to prevent you from having merge conflicts.
Read about creating an upstream branch first: https://help.github.com/articles/configuring-a-remote-for-a-fork/
Then do this: https://help.github.com/articles/syncing-a-fork/
It's for when you're having a hard time going through the github website to update your fork.
The other way is to delete your fork, and re-fork.