title: Strategy For Keeping Git Feature Branches Up to Date
body: <p>I like to keep my feature branches up to date with develop.  Is there anything wrong with frequently doing "git merge --no-ff develop".  And then at the end, running "git flow feature finish feature1".  These feature branches are shared (which means it is possible that someone else could be working on it, or that I'm developing out of it at my computer at home), mostly because I like knowing that they are backed up somewhere else.  If they weren't shared, would consistently rebasing be preferred?  </p>
  
  <p>Or is it better to not keep your feature branches up to date and just merge everything in at the end?</p>