8 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
Jonathan Hodgson 63c02e13f9 Modifies makefile 5 years ago
Jonathan Hodgson 526bafc972 Adds Readme 5 years ago
Jonathan Hodgson 2712cddb60 More work on presentation + improves auto images 5 years ago
Jonathan Hodgson b128151e39 Starts presentation 5 years ago
Jonathan Hodgson d3db0dd7eb This is not the commit message you are looking for 5 years ago