Git commands

Goal of this workshop is to be able understand what happens under the hood after typical git commands.

Follow the commands in Tasks document.

Comparison of Diff tools

This table was relevant in october 2018
Y - Means YES
Paths - Number of Windows the tool uses to visualize the diff
- 1 - source revision with target revision below in one window
- 2 - source revision and target revision side by side
- 3 - source revision and target revision side by side with final result or base revision below in third window
- 4 - source, target, base revisions and result windows

Merge tool	Last release	Paths	Navigate to conflict	Git build-in	Syntax highlighting
TortoiseGitMerge	2018/2	3	Y
p4merge	2018/2	4	Y	Y
Winmerge	2016/2	2		Y	Y
kdiff3	2014/7	4	Y	Y
Sourcegear difmerge	2013/10	3	Y
Visual studio Code	2018/7	1			Y
Visual studio 2017	2018/7	3	Y		Y
Compare IT!	?	2