title: Merging remote branches in git
body: <p>I am developing a system where I'm following the trails of another project, adding my own stuff but not directly to the original project. I setup my repository with three remote branches:</p>
  
  <ol>
  <li>Master - Where my development takes place.</li>
  <li>Vendor - Where I sync with the original project periodically.</li>
  <li>Integration - Where I want to merge (Master) and (Vendor) together. </li>
  </ol>
  
  <p>My workflow idea is for the synchronization to take place automatically (since it's basically a fast-forward of sorts), and the integration to be half-manual (since it requires merges and fixes). I've got the first part (the sync) covered, but I can't figure out what command/s to actually issue to integrate Master and Vendor into integration.</p>
  
  <p>This is the output of <em>git branch -a</em>:</p>
  
  <pre><code>* integration
    master
    vendor
    remotes/origin/HEAD -&gt; origin/master
    remotes/origin/integration
    remotes/origin/master
    remotes/origin/vendor
  </code></pre>
  
  <p>How do I go forward from this point to:</p>
  
  <ol>
  <li>Synchronize this workspace with the remote repository?</li>
  <li>Merge vendor &amp; master into integration?</li>
  <li>Push integration back to the remote repository?</li>
  </ol>
  
  <p>And obviously, if I have something wrong in the workflow I'd love to hear it.</p>