While using Meld I am seeing three vertical sides:
On the left Test.txt.LOCAL.10512.txt
In the middle Test.txt
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.
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.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With