Force your forked repo to be the same as upstream.

3/4/2012 - 7:27 PM

git fetch upstream
git reset --hard upstream/master

Cacher is the code snippet organizer for pro developers