git

Prof. Dr. Mirco Schoenfeld

intro

Looking familiar?

intro

changes in your, e.g., data report:

updates in the data
changes in visualizations
modification of text
…

intro

(Commons 2009)

intro

git graph

Trunk:

Unnamed branch of a file tree under revision control

(Commons 2009)

git graph

Structure:

The structure of the revisions is not a tree (although it is often referred to as the revision tree) but a directed acyclic graph.

(Commons 2009)

git graph

Tag:

A tag assigns a label to a revision (including many files) allowing to directly jump to that revision. Often used to label a specific version of a software.

(Commons 2009)

Check git out

Let’s check git out!

Useful resources:

https://git-scm.com/book/en/v2

(Chacon and Straub 2014)

It’s your turn

task

How can I git started?

Check out the tutorial on https://githowto.com/
Play along until step 10: getting older versions

OR check out the more playful attempt: https://ohmygit.org/

Advanced git

Assuming you know committing and checkouting
Try out creating a branch from https://githowto.com/creating_a_branch

OR check out the more playful attempt with even more advanced topics on branching https://learngitbranching.js.org/

Time: 45 minutes

A tip: Avoiding vim-hell for git commits:

Change the default text editor for commit messages in the git bash before you do anything else:

Windows users:

git config --global core.editor "notepad"

Mac users:

git config --global core.editor “open -e -W -n”

https://zxtech.wordpress.com/2020/03/29/setting-textedit-as-default-git-editor/

Task Summary

What were your findings?

What did you learn?

Can you see yourself using that in your
personal projects and daily routine?

git trunks and branches

Branching:

Duplication of an object under version control. Objects can then be modified separately and in parallel so that they become different. These objects are called branches.

(Commons 2009)

git trunks and branches

Merge:

A fundamental operation that reconciles multiple changes made to a version- controlled collection of files. Necessary when files are modified on two independent branches. The result is a single collection of files that contains both sets of changes.

(Commons 2009)