git basics

JQI-QuICS-CMTC Seminar

Eddie Schoute (QuICS/CS)
December 15, 2017
PSC 2136

*Snacks and drinks at 4 pm*

**NOTE: There is an optional workshop after the talk for those who are interested in learning more about git and trying it out themselves. It is suggested to bring their laptop with them and stay for the workshop (~10-30 minutes).

Version control is a tool used by many programmers in industry to collaborate on software and other text files. And it so happens that LaTeX is also written as a text file! We in academia can use the extensive tooling that has been developed to support collaboration---even across continents.
In this lighthearted talk I will present the very basics of using the git version control system. We will learn how to commit your changes to a git repository, view what your collaborators have been up to, and resolve those pesky merge conflicts. With git there is also no need any more to save those version 6, 7, 8-FINAL, etc. files!

A draft of the talk slides is available at https://eddieschoute.github.io/git-basics/  which are subject to change up to the presentation date.

WORKSHOP:
After an introductory talk of ~25 minutes we will try our hands on an exercise of using git. So please come with a laptop with git installed. Most Linux and OSX system will already have git installed (try running `git` in your terminal), otherwise: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git.
You may also want to familiarize yourself with the very basics of using your command line: Opening a command terminal, changing directories (the `cd` command) and listing your current directory contents (the `ls` command on osx/linux and `dir` on windows).

The demo will use a git repository located at: https://github.com/eddieschoute/favorite-animals/ Please make a (free) Github account if you wish to try collaborating with others during the demo.