Git mastery in 20-minute increments: Merging and mergetool
Channel: Nathaniel Whiteinge
Date: 2012-07-27

The fourth presentation on Git given at Cars.com. This presentation touches on how Git handles merging and how to use mergetool.

Each demonstration in this presentation has accompanying slide notes (the .rst file). Slide downloads and the graph-dag script are available on GitHub:
https://github.com/whiteinge/presentations/tree/master/cars_2012-04-27_git

The wiki page on using vimdiff as a mergetool with Git:
http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool