title: Keeping a branch up to date with master
body: <p>I have a remote repository that I've pulled and am branching from.  I want to keep the new branch up to date with changes done to master.  I'm thinking about the workflow below, does it make sense or are there are better ways to do this?</p>
  
  <ol>
  <li><p>Initial branching and checkout:</p>
  
  <pre><code>git checkout master
  
  git pull
  
  git checkout -b my_branch
  </code></pre></li>
  <li><p>Do some work in <code>my_branch</code>, then periodically:</p>
  
  <pre><code>git checkout master
  
  git pull
  
  git checkout my_branch
  
  git merge master --no-ff
  </code></pre></li>
  </ol>
  
  <p>Repeat step 2 as needed, with periodic pushes to the remote <code>my_branch</code>.</p>
  
  <p>Then when ready for a merge back:</p>
  
  <pre><code>git checkout master
  
  git merge my_branch --no-ff
  </code></pre>
  
  <p>Sound ok?</p>