title: Confusion regarding github workflow
body: <p>I have been reading github workflow for a while, but still bit confused in certain part.</p>
  <p>My understanding of github workflow:</p>
  <ol>
  <li>Create a branch off from master and given a descriptively name(ie:
  new-oauth2-scopes)</li>
  <li>Commit to that branch locally and regularly push your work to the same named branch on the server</li>
  <li>Open a pull request and merge it to master after review and sign off the feature</li>
  <li>Once it is merged and pushed to master, you can and should deploy immediately</li>
  </ol>
  <p>I have two confusions:</p>
  <ol>
  <li><p>When our QA can sign off the feature? I can deploy a feature to a dedicated location and QA can test there. But as we need to merge to master and then deploy to production, does QA need to do the final sign off after merge to master (in case something went wrong during merge)?</p>
  </li>
  <li><p>When multiple features are on development, and one is merged to master, should other features grab the changes from master branch first before these features can be tested and signed off? As otherwise you could end up with coding conflicts if some common projects were modified the same time.</p>
  </li>
  </ol>