title: How to keep a git feature branch up to date with master after a PR
body: <p>I have a feature branch that works off of a pretty active master branch. </p>
  
  <p>I've been rebasing with master before pushing to my remote. I've now PRd my branch with master. </p>
  
  <p>What are recommended approaches to keep my feature branch up to date with master as this is still a work-in-progress? </p>
  
  <ul>
  <li>I don't believe I should continue to rebase in case anyone pulls and makes updates to my branch.</li>
  <li>Is my best bet to merge master into my feature branch from now on when I want to push my branch again? </li>
  <li>I would not worry about changes to master normally, but this is a work-in-progress PR, and my branch could eventually become out of date w/master. </li>
  <li>Or should I not worry about it, and deal with conflicts when I merge if there are any?</li>
  </ul>
  
  <p>I'm working on a new project with a large team and active master branch, so I haven't come across this issue before.</p>