# Version control

## Setup

Move `~/.gitconfig` or comment out any non-standard settings.

Create polls (yes/no), (green/amber/red)

## Lesson Timings

- 00 Intro: 10
- Put people in pairs (communicate on slack)
- using nano
- `git config --global core.editor nano`
- 01 Solo: 15
- 02 Fixing mistakes: 10
- 03 Publishing: 15
- 04 Collaboration: 20
- Add `/invitations` to repo URL if they don't get an email
- When editing the same file and not trying to get a conflict, must not edit adjacent lines to avoid merge conflict
- 05 Fork and Pull: 10
- 06 Git theory: 5
- 07 Branches: 10
- 08 Advanced: 15
- 09 Publishing from GitHub: 5
- 10 Rebasing: 10
- 11 Debugging: 5
- 12 Multiple remotes: 10

4 x 45 minute taught sessions (including hands-on exercises):
- 13:00-13:45
- 00 (Iain), 01 (Ed)
- (15 minute break)
- 14:00-14:45
- 02,03 (Ed, up to and including "Giving permission"), 04, 05 (Iain + Ed on 04), 06
- (30 minute break)
- 15:15-16:00
- 07, 08 (if time allows), 09 (Ed)
- (15 minute break)
- 16:15-17:00
- 10, 11, 12 (if time allows) (Iain)