How to merge a repo you have forked
https://help.github.com/articles/configuring-a-remote-for-a-fork/
https://help.github.com/articles/syncing-a-fork/
how to merge conflict
https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/
how to revert all uncommitted changes
http://stackoverflow.com/questions/14075581/git-undo-all-uncommitted-changes
git reset
git checkout .
git clean -fdx