================================
Session 2: git / version control
================================

Basic git
=========

Tutorial link:

https://github.com/apawlik/TGAC-6-Nov-2013/tree/master/version-control

Cover:

* branching and merging;

* conflicts;

* creating a project on github;

* pushing to the project on github;

Git pull requests
=================

Cover:

* setting up a pull request;

* viewing differences;

* commenting on individual lines;

* multiple pushes;

* updating from another branch;

* github markdown, including checklists!

* online editing of github files.

External Resources
==================

* Github Flow description

  http://scottchacon.com/2011/08/31/github-flow.html