Warm-up: Read the Diff — what did this change do, and would you
approve it?
The problem of the day: The Merge Conflict — two people edit the
same three lines on purpose, and the tool tells the truth about it.
Diagnostic: nothing is collected. What teams already do to each
other’s work today decides how much of this unit is spent on the
habits rather than the commands.
Compare and name it: Version Control — commit, branch, merge,
conflict, history
Set it up today: Using Version Control — every team, every
machine, before anybody leaves this room
Discussion: Whose Code Is It — credit, licences, and what you
are actually allowed to borrow
Things to do before our next class
Milestone: repository set up, with at least one commit from every
single member of your team.
Read The Handover tonight, not at the end of the course. It is the standard
the next five weeks are being built to, and today is the day it
is cheapest to design for.