IMPRS conference workshop 2022
:calendar: June 3rd 13am - 15pm
:door: tba
:computer: Online link
We will use this repository throughout the Git Workshop. All workshop material including exercises will be uploaded here a few days prior to the Workshop
Please check out the "Howtoprepare" document and make sure you are all set-up prior to the workshop.
This workshop will introduce the collaborative workflow when using Git & GitHub. You are familiar with the basic local Git cycle but would like to learn how to use Git version control in a team? We will go over commonly used GitHub features such as issues, forking and pull requests, when and how to use branches as well as how to tidy up your commit history. Importantly, we will dare to do some live collaborative work during the workshop, which means you will get first-hand experience on how to handle merge conflicts as things get messy.
Basic previous knowledge of local Git cycle required (e.g. you should know what push, pull, commit and add are and why this isn’t the correct order of those commands. If you don’t, better choose Workshop “From zero to git-pull-push”). You should also have at least already cloned a GitHub repo in the past. In this workshop we will use Git from the command line, so you should be familiar with the basics on the command line and have your configuration set-up (e.g. set your git identity and configured text editor of your choice). You should also create a GitHub account if you haven’t already.
13:00 :wave: Welcome
13:15 :speaker: Intro collaborating via Git (merge conflicts)
13:30 :pencil2: Exercise 1 - Our first push
13:40 :speaker: Branches, Forks & Pull requests
14:00 :cookie: Break & Stretch
14:05 :pencil2: Exercise 2 - Hands-on
14:40 :ribbon: Wrap-up