title: Git strategy to merge a separated branch with individual commits, into base branch
body: <p>On my team we have an epic story to be developed in a period of time, and we are many developers doing individual stories (related with this epic story).</p>
  <p>Example: let's name this epic as &quot;Update FAQ web page&quot;
  Some available stories will be like:</p>
  <ul>
  <li>&quot;Change FAQ page color&quot;</li>
  <li>&quot;Change FAQ font style&quot;</li>
  <li>&quot;Reorder FAQ questions&quot;</li>
  </ul>
  <p>etc</p>
  <p>To avoid merge isolated stories into <code>master</code>, and considering other teams (working on other epics) will be constantly updating our <code>master</code> branch, we want to do something like this:</p>
  <ul>
  <li>Start creating a separated branch from <code>master</code>, named
  <code>feature/newFAQPage</code></li>
  <li>All developers will merge their stories into <code>feature/newFAQPage</code></li>
  <li>A developer will be updating <code>feature/newFAQPage</code> with <code>master</code> periodically</li>
  <li>Once all our stories were being completed, we want to merge
  whole <code>feature/newFAQPage</code> into <code>master</code> (basically, merge all stories together at the same time)</li>
  </ul>
  <p>My idea is to achieve this, periodically running <code>git merge master</code> into <code>feature/newFAQPage</code>, so <code>feature/newFAQPage</code> will be a mix of FAQ's team changes and non-FAQ's teams changes.</p>
  <p>Is this git strategy feasible? If so, is this the best way or there is another way to do it?</p>