3 Commits (1df85219c918c486922d000281ef81aa0d704285)

Author SHA1 Message Date
Jonathan Hodgson 1df85219c9 Write slides about merge with conflict 5 years ago
Jonathan Hodgson c6c938207f Adds references and branches slides 5 years ago
Jonathan Hodgson 22ef5f581d A lot of work on the presentation 5 years ago