If you've forked, or made a branch, don't do a merge, do a git rebase instead.
If you've forked, or made a branch, don't do a merge, do a git rebase instead.