title: How to update my local branch of fork with original repository from which i forked the master branch of local repository?
body: <p>Suppose i clone from a repository <strong>foo</strong></p>
  
  <p>I get a local copy name <strong>my/foo</strong></p>
  
  <p>I then create a branch <strong>mybranch/foo</strong> .
  Then i made some commits into <strong>mybranch/foo</strong> while some PR's get merged in <strong>foo</strong> remote repository( remote repository ) .
  I wan to merge my local branch <strong>mybranch/foo</strong> into <strong>foo</strong> but to do this i have to get all those changes which have taken place in <strong>foo</strong> while retaining changes which i have made in <strong>mybranch/foo</strong> . </p>
  
  <p>I have tried using 
  <strong>git rebase upstream/master</strong> 
  and
  <strong>git merge upstream/master</strong> 
  but i have not got the desired result .
  but i have not got the desired result .
  Above methods work for <strong>master</strong> of local repository but not for <strong>mybranch/foo</strong> .
  I want to know the best way of doing this .</p>