title: GitFlow Workflow, Pull from UpStream Master, then Merge into what?
body: <p>I am using git flow.</p>
  
  <p>I have a repository inside of an organization that is the headquarters for a project, I also have a fork of this repository in my personal repos. When I make a change to the code, I create a pull request on the organization's repo. </p>
  
  <p>My question is, how do I pull/merge that pull request's merge commit into my personal repo? </p>
  
  <p>Do I <code>git checkout master &amp;&amp; git pull upstream master</code>?</p>
  
  <p>Then how do I manage the develop branch? <code>git checkout develop &amp;&amp; git merge master</code> ?</p>