Last Monday, Daniel Bankmann and Benjamin Unger presented the version management system GIT in our tools seminar. After showing the general procedure about adding files, committing changes, pushing them to the server and pulling changes from the server, they spent some time explaining so called merge conflicts and how to resolve them. Other topics that were discussed are branches and tags. The annotated list of commands used during the seminar can be found here or by cloning the GIT repository of the talk:
git clone firstname.lastname@example.org:GSSC/tools_seminar/git_tutorial.git
We are looking forward to the next talk about makefiles and latexmk.