Keeping a fork up to date

Question

I wanted to commit somthing to a github repository, but I (obviously) didn\'t have any rights to do so. I made a fork of that repo, commited my changes and submitted a pull-

Answer 1

Adding to Diki Andriansyah answer, rather than using

git merge upstream/master

try using:

git pull upstream master

This helped me :) .