Collaboration 16 April 2013 How version control helps with collaboration Conflicts Conflicts with word, with dropbox, and the role of communication How git behaves and how history looks