Git

Add comments to this issue for specific areas of git that you are interested in. Also, please +1 existing comments so we can get an idea about which topics make the most sense to cover.

Some areas I plan to cover in a future presentation:
- Resolving merge conflicts using GUI tools such as KDiff.
- Branching and merging
- Rebasing vs merging
