title: How best to Merge Git Changes over SSH
body: <p>I have a feeling I'm going about this the wrong way.</p>
  
  <p>I have a software project with 3 developers all working on their own GIT Repo making frequent changes. They're pushing their changes to the server, where I then merge the changes and publish to the live web software.</p>
  
  <p>I've been trying to find a solution that I can easily use to resolve conflicts when I merge code (there's typically a bunch of conflicts with each merger). My experience has been that VIM alone is terribly slow at this but I've found a program called Splice:
  <a href="http://sjl.bitbucket.org/splice.vim/" rel="nofollow">http://sjl.bitbucket.org/splice.vim/</a>
  That I'm trying to get the hang of it. However it seems that even this program tell you on the home page: </p>
  
  <blockquote>
    <p>"Splice is a merge tool which means you'll be working with it on your
    development machine, not over SSH on your servers."</p>
  </blockquote>
  
  <p>Is it such a big deal to do mergers on a production server over SSH? It seems like it's a much bigger pain in the butt to grab all that code that is on the server, download, merge, and re upload every time I have to merge code.</p>
  
  <p>I'm new to this, but I feel like I'm missing something. Is there a better way to go about this?</p>
  
  <p>All advice is welcome :)</p>