title: Correct Git workflow for shared feature branch?
body: <p>I am trying to figure out the right workflow for this situation:</p>
  
  <p>On the shared repo, we have these branches:</p>
  
  <pre><code>-master
  -feature
  </code></pre>
  
  <p>The <em>feature</em> branch is a <strong>shared</strong> branch, since many developers are working on a new feature together. They are actively pushing their changes to the feature branch.</p>
  
  <p>I'm trying to avoid 'conflict hell' for the day that <em>feature</em> finally gets merged back into <em>master</em>. Currently, I see some options:</p>
  
  <p>1) <strong>Actively merge <em>master</em> into <em>feature</em>, and do it often.</strong> However, this is not recommended in the git docs, and I'm starting to see why. When I try this, I seem to fix the same conflicts over and over again.</p>
  
  <p>2) <strong>Use rebase in some way.</strong> I've read up on this, but it looks like it wont work since the <em>feature</em> branch is actually shared. All it takes is one developer to do 2 rebases, and other developers could have conflicts from mismatched history.</p>
  
  <p>3) <strong>Turn the <em>feature</em> branch into an integration branch,</strong> and have the developers use their own independent feature branches with rebasing to keep things sane. </p>
  
  <p>4) Something completely different?</p>