git mergetool explained

This video describes how to fix merge conflicts between files where multiple developers have modified the same file and now you're having to use the mergetool

[JuanMartinez-nqon]

Thank you for first explaining what each file/window represents. Other tutorials missed this.

[guyswartwood]

Glenn, I appreciate you taking the time and effort to explain the layout of the application and merge process. Although I am using Beyond Compare to do the same thing (merge conflicts), the layout is the same and therefore your explanation of what I am seeing is VERY helpful.

[jimmyryan]

Hi Glenn, thanks for that. I've been using GIT for years on my own and about to work with other developers that also use it for the first time and find all the other examples super simplistic. This is very practical.

[rheaghen]

A quick explanation of the key commands in the beginning would be useful. I still do not understand how to use git mergetool. I saw you resolve a code block, but you did not declare the keyboard commands.

[ThisGuyRocksLikeCrazy]

I think instead of manually modifying the bottom file, you can simply use diffget <screen #> to apply the change from whatever screen that you'd like.

[AkamiChannel]

I don't know why so many people downvoted. This was quite helpful.

[andreeadumitru]

From now on, merge conflicts are not annoying anymoreeee! Thanks

[sbarrett]

Very helpful video. Not sure why it was so difficult to find simple instructions online for using vimdiff.

[coolaman]

Hi Glenn. May i know the hotkeys you have used. Cntl+w+w is one. If we have to undo in editor then how we gonna do it. When i am trying mergetool its creating unnecessary files or version of that file.

[Mohamed_jeddah]

ohh this was a life saver . thanks Glenn

[RyanStille]

What tool is this? I ran 'get mergetool' and got: This message is displayed because 'merge.tool' is not configured.

Sounds like I need to configure a merge tool, which one are you using in this video?

[taofeng]

Seems you didn't config your merge tool...

[ab]

Too much talks, not much action. What I wanna know as audience of this video is what to type to solve conflict using this tool!

[genesisbustamante-durian]

Why do you talk with strong united statian accent.