title: Easier way to keep a git feature branch up to date
body: <p>I was wondering if anyone would have a better suggestion for keeping a feature branch in sync with it's parent branch. </p>
  
  <p>We typically have multiple feature branches that are being worked on at a time, each derived from our <code>develop</code> branch. It's fairly common for feature branches to be merged into <code>develop</code> a couple times a day. </p>
  
  <p>In order to stay on top of changes (i.e. resolve conflicts) I find I need to keep the feature branches I'm actively working on up to date with <code>develop</code>.</p>
  
  <p>To do this I run these commands a couple times a day:</p>
  
  <pre><code>git checkout develop
  git pull
  git checkout feature/foo 
  git merge develop 
  git push
  </code></pre>
  
  <p>The last <code>git push</code> I usually only do if I'm working with someone else on the feature branch.</p>
  
  <p>Is there a better or more convenient way to do this? </p>