title: Understanding Meld 3 way merge with Git
body: <p>My boss set up our new Git repository, one on our Windows server and one on our Linux Server.</p>
  
  <p>I was asked to resolve our conflicts so I chose to use Meld. </p>
  
  <p>When I run the first file it opens 3 windows;</p>
  
  <ul>
  <li>shipping.php.local.####,</li>
  <li>shipping.php</li>
  <li>shipping.remote.####</li>
  </ul>
  
  <p>I have read the docs and help but I'm having trouble understanding. From what I can see, the <em>shipping.remote</em> has the changes I made to the files on the Linux box that I want to keep. <em>shipping.local</em> are the files from the Windows server and the <em>shipping.php</em> is the file that will result from the merge.</p>
  
  <p>So if I just take the code from the <em>shipping.remote</em>, move it to the middle file(shipping.php) and save it, I will have the updated file I want on the Git repository on the Linux box?</p>
  
  <p>I hope I'm explaining correctly, I just don't want to mess something up. </p>