That is the way to do it...

When you're alone in the project... otherwise: learn how to rebase!

I tried to put my friend in the project, but only found that it is either:
A: He is too srupid and can't do some basic stuff entirely on his own and called me 67 tomes
Or
B: I am too egoistic and want to do it all by myself

git fetch
git rebase
(...fix conflicts if any and commit merge...)
git push