Sync forked repo with upstream after merge

sync_upstream.md

Clone your fork and cd into it

git clone https://github.com/yourname/repo.git
cd yourname/repo

Add upstream remote

git remote add upstream https://github.com/original-author/repo.git
git fetch upstream

Pull Changes from upstream and push to fork

git pull upstream master
git push origin master

Ignore all changes in fork and sync with upstream

git reset --hard upstream/master
git push -f origin master

I am using master as the example branch name here.