Git Tutorial 9: Diff and Merge using meld

This git tutorial covers (1) How to install meld (2) Run meld using git difftool command to see diff (3) Use git mergetool command to use meld to resolve merge conflicts.

Next Video:

[ajaykumark]

@4:27 he covered a very important concept of "pulling before pushing". In real world the master might have changed since the last time you did a push. So we have to pull before we actually push.

[fmpagencyllc]

Thank you very much for taking the time to put together this video on using Meld for resolving merge conflicts.

I use X-Code visual diff tool when I work on a Mac and really like it, but I didn't have a tool on Windows that felt as good. Meld + your video was exactly what I was looking for, the quick tips helped me to level up in less time.

~ Reuben

[dazecm]

Thanks for sharing. This helped me get p4Merge from Perforce configured.

[SergerFu]

AND YOU GOT best indish english pronounce of i ever hear man)))

[ВанКот-щп]

Thank you very much! I don't know English well, but your lesson helped me a lot! Thank you very much!

[harshanveeturi]

Thank you so much Sir, for putting this much efforts and helping us learn these tutorials for free :) thank you once again

[pranoykovuri]

Thank you for the wonderful tutorial!!

[SwampyOgre]

Nice video. I actually didn't mind the music, awkward silences can be worse.

[amirbaghban]

Thanks a lot for your nice lessons. I encounteted an error after using the command git difftool origin/master which is fatal: ambiguous argument 'origin/master': unknown revision or path not in the working tree.


I do not know what to do.

In my meld folder in program files, there is not meld.exe and instead I just can see two meld as application.

[catamarancn]

How to use both of lcoal and upstream?

[dutta.alankar]

I use a Linux environment (Ubuntu). I created a file a ~/.gitconfig file and added your lines replacing user and mail by mine
I also used
sudo apt-get install meld
And it got installed in /usr/bin
Issuing git difftool HEAD command shows nothing it just runs and goes to the next line. Not even any error message. Can you tell me what's wrong?

[Dadaadad]

I guess you don't need Meld if using VS code? Merging tool comes integrated

[vinayvasudev]

Hi Thanks for the video. I have a doubt here, what if there are multiple changes, and I have done only some of the changes, but accidentally gave save. Next time when I run meld tool, it says files are identical, but infact some merges are still to be done. Is there any way i can revert the file back?

[NitinChauhan-vhyk]

Can the "git mergetool origin/master" be used only when there is a merge conflict?

[PatricHua]

git difftool -d [branch-to-compare-against]
This command pulls up meld and compares the files in the current branch against another branch.

[vahidnajafi]

Hi. Thanks for this tutorial. The difftool works fine. But when I run `git mergetool`, the default mergetool starts running instead of meld. Any idea? (I have set the .gitconfig file as you mentioned)

[devmishra]

Great video! What is that background music?

[mannepallipraveen]

HI, could you please make tutorial on python scrapy

[katrine]

I couldn't figure out I had to click on that arrow...

[seelamsettisatish]

hi
remove suggestion videos at that end of the video because summary of commands are not visble.