Github: Merge commits during download requests

Question

I have a fork in the project, to which I contribute. Currently, I have an open request for output from a branch on my plug (the wizard is clean, as in a duplicate of the original repository wizard). No problem so far.

Now, the original author has pushed a few new commits that I want to integrate into my branch (since these commits were made to help my work on this branch). Is there a better way than just pulling them into my fork and combining them with my branch?

I understand that reloading is impossible (or at least it should be avoided), given that I already use commits to request pull, and I really do not want to confuse anything (not for me, but also not for the original author of the project, given that he needs to merge his changes at the right time later).

So now I would do the following:

git pull upstream git checkout mybranch git merge master git push 

Is this the best way to do this?

Answer 1

In fact, if nothing has been pulled from your branch, rebooting is still an option. I believe that GitHub is smart enough to handle permutations in pull requests (it looks at a branch, iirc).

However, the merge workflow is also an option. You can do this with the commands that you have in your question, or if you do not want to exchange branches around, you can only do this with the following:

 git checkout mybranch git pull upstream master git push