Day 5: Git and Github

Git is a version control tool. This means that you can use it to record and review changes you make to files over time. With Github, you can shares these files and changes with other people, and also incorporate changes made by other people.

In today's course, you'll learn why that's useful for scientists, and how to use git and github as part of a collaborative project.

Prestudy

Please install git before starting this course, and create an account on github.

Course material

The slides in the presentations are based on the Version Control with Git course from Software Carpentry. You can treat their course website as the "handout" and worksheet for this course: our syllabus is sections 1-9 from their material.

Course schedule

• 09:30-10:00 Lecture + demonstration on Git

• 10:00-12:30 Work through sections 1-6 in the course site, which correspond to the following videos:

1. Introduction to Version Control
2. Setting up git
3. Creating a repository
4. Git's three-tier model
5. Adding and committing files
6. More on adding and committing
7. Exploring history
8. Demo on exploring history
9. Ignoring files
10. Git sessions wrap-up

• 13:30-14:00 Lecture + demonstration on Github + resolving conflicts

• 14:00-16:00 Work through sections 7-9 on the course site, and the following videos:

11. Introduction to Github
12. Github and git remotes
13. Example of Github integration
14. Collaboration on Github
15. Resolving conflicts
16. Wrapping up

• 16:00-16:30 Q&A on github