Github: Merging two branches

git remote add remote-name remote-github-url 
git fetch remote-name 
git merge remote-name/branch-name 
git status

Github: Update a GitHub forked repository;

git remote add upstream github-URL
git fetch upstream 
git merge upstream/master master 
git pull upstream master 
git push