Understanding Meld 3 way merge with Git

git repository meld 3-way-merge
Naterade picture Naterade · Aug 29, 2012 · Viewed 13.8k times · Source

My boss set up our new Git repository, one on our Windows server and one on our Linux Server.

I was asked to resolve our conflicts so I chose to use Meld.

When I run the first file it opens 3 windows;

  • shipping.php.local.####,
  • shipping.php
  • shipping.remote.####

I have read the docs and help but I'm having trouble understanding. From what I can see, the shipping.remote has the changes I made to the files on the Linux box that I want to keep. shipping.local are the files from the Windows server and the shipping.php is the file that will result from the merge.

So if I just take the code from the shipping.remote, 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?

I hope I'm explaining correctly, I just don't want to mess something up.

Answer

Greg picture Greg · Aug 29, 2012

You understand correctly what are the files you see. But if you merge in a way you described (incorporate changes from remote to base), you will loose changes from local. In fact, you have to merge both local and remote into base. You could use Changes | Merge all non-conflicting and then resolve each conflict by hand.

Related questions

How do I push a new local branch to a remote Git repository and track it too?

I want to be able to do the following: Create a local branch based on some other (remote or local) branch (via git branch or git checkout -b) Push the local branch to the remote repository (publish), but make it …

Read More
How do you clone a Git repository into a specific folder?

Executing the command git clone [email protected]:whatever creates a directory in my current folder named whatever, and drops the contents of the Git repository into that folder: /httpdocs/whatever/public My problem is that I need the contents …

Read More
How do you push a tag to a remote repository using Git?

I have cloned a remote Git repository to my laptop, then I wanted to add a tag so I ran git tag mytag master When I run git tag on my laptop the tag mytag is shown. I then want …

Read More