Rebase github pull request

All

I submitted a PR some time ago to a project and now I need to pull the master branch from the main tree into my branch and update the PR.

What should be the course of action to do so in order to not create a conflict with automatic build/testing (travis)?

Thank you.

The reason for my question is that I tried to do it once and it fails compilation on Travis CI, because of the conflict with the upstream master.

So, can anyone points me in the right direction?

Are those the right commands to do that:

git fetch upstream/master  git checkout <my_PR_branch>  git rebase upstream/master  git push  

Will it rebase my PR and update the branch to the new upstream master commit? Or it will create problems with the PR?

Thank you.

https://stackoverflow.com/questions/65523698/rebase-github-pull-request January 01, 2021 at 01:06AM