Workshop on Version Control using Git

Feb 24, 2021

09:00 am - 18:00 pm

Instructors: Bezaye Tesfaye, Hannes Fuchs, Maximilian Dolling, Stefan Lüdtke

Helpers: Christian Meeßen

General Information

Together with the advancement of new tools and techniques, and the availability of large datasets in different research domains, a solid understanding of common scripting languages and version control systems is becoming more and more important for many researchers. Having the knowledge and skills on how to use tools and techniques to analyze data efficiently, to preserve research output and to collaborate with peers benefit every research domain. This is a software carpentry workshop aiming to close the gap between researchers and the know-how for new tools and techniques. It is an interactive workshop including sessions from concepts to practice on topics that can be used in many research domain. The sessions are organized in a friendly environment, where people can learn from each other and share experience. Participants also get support throughout the whole sessions. Registration is through this link until Feb16, 2021.

Who: The workshop targets audience from graduate students to advanced researchers, and doesn't require previous knowledge of topics that will be covered.

Where: This training will take place online. The instructors will provide you with the infromation you will need to connect to this meeting.

When: Feb 24, 2021. Add to your Google Calendar.

Requirements: The workshop will be held virtually using, and participants should prepare: (1) a laptop with a Mac, Linux, or Windows operating system (not a tablet, Chromebook, etc.), (2) a headset if possible, and (3) install required software packages for the workshop (see more information in the setup section).

Contact: Please email swc-workshop-org@gfz-potsdam.de for more information.


Code of Conduct

Everyone who participates in Carpentries activities is required to conform to the Code of Conduct. This document also outlines how to report an incident if needed.


Collaborative Notes

We will use this collaborative document for chatting, taking notes, and sharing URLs and bits of code.


Surveys

Please be sure to complete these surveys before and after the workshop.

Pre-workshop Survey

Post-workshop Survey


Schedule

09:00 Welcome & introduction
09:10 Motivation
09:30 Basics and using staging area
10:40 Coffee
11:00 Rollback
11:30 Branching and merging
12:15 Q&A
12:30 Lunch
13:30 Conflict resolution and sharing repositories
14:45 Coffee
15:15 Inspecting history
16:15 Synchronizing repositories and centralized workflow
17:45 Wrap-up

Syllabus

Version Control with Git

  • Creating a Repository
  • Recording Changes to Files: add, commit, ...
  • Viewing Changes: status, diff, ...
  • Ignoring Files
  • Sharing repositories online
  • Git rollback functionalities
  • Resolving Conflicts
  • Centralized workflow
  • Git for collaboration

Setup

To participate in this workshop, you need to follow installation instructions described through this link before the workshop.

Due to time constraint, please keep in mind we wont be able to fix installation issues during the workshop. You will get a pre-workshop session in order to help you solve any technical issues that might happen while you are trying to install or configure all the requirements. For the a pre-workshop session, you will get full information on the date and time before hand.

We maintain a list of common issues that occur during installation as a reference for instructors that may be useful on the Configuration Problems and Solutions wiki page.