If you ever get into out-of-sync trouble, clear your working tree on your fork (git add && git commit && git push) and 
run the following: 

git checkout master 
// git fetch upstream (add this for a slightly safer solution)
git reset --hard upstream/master
git push --force