Rebase local branch with upstream branch
<p>Chain of events after forking a repo:</p>

<ol>
<li>Created a branch</li>
<li>Made some changes</li>
<li>Submitted PR of my branch to upstream master</li>
<li>Repo owner creates a branch on his repository and merges my PR along with some other changes.</li>
</ol>

<p>I still have work to do on the PR, but now I have to rebase my branch on the branch that the repo owner created to test some things before my branch can be merged with his master.</p>

<p>How can I rebase the branch in my local repo with the branch created in the remote? I basically want one of my branches to be the same as one of the branches in the upstream repo (not master).</p>

<p>Apologies in advance for the potentially poor use of terminology.</p>