CODEWITHSUNDEEP
gitgit-diffmeldgit-merge-conflict
Manish Kumar
Manish Kumar

Reputation: 10482

Can anyone help me to understand three window in Meld diff tool

While using Meld I am seeing three vertical sides:

  1. On the left Test.txt.LOCAL.10512.txt

  2. In the middle Test.txt

  3. On the right Test.txt.REMOTE.10512.txt

Can anyone help me to understand these three windows and which one should I consider as final merged file? I am not able find anything regarding this on the Internet.

Upvotes: 2

Views: 1406

Answers (1)

mlevytskiy
mlevytskiy

Reputation: 1665

I use same tools (araxis merge). First file - your local file, second file - result what be after merge, the third file - file in git repository.

So your need change middle file and fix all conflict in it.

Upvotes: 7

Related Questions