Git and GitLab

Git and GitLab#

Topics 💡#

In the following you’ll find the objectives and materials for each of the topics we’ll discuss during this session.

Version Control and Git: Background and Theory#

Objectives📍

  • What Version Control is and where it comes from

  • Why it is useful

  • The basic principles of Git:

    • the Git database

    • structure of the Git repository

    • the staging area

    • commits

Materials📓#

Basic Git Workflow#

Objectives📍

  • init

  • add

  • commit

  • status

  • diff

  • log

Materials📓#

-Sub-section Basic workflow

Branching and merging#

Objectives📍

  • branch

  • checkout

  • merge

  • HEAD and detached HEAD

  • moving in your commit history

  • how to solve a merge conflict

Materials📓#

GitLab workflow#

Objectives📍

  • What is GitLab

  • local vs. remote repository

  • push

  • pull

  • clone

  • fetch

  • merge

  • merge conflict between your local and remote repository

Materials📓#

Contributing on GitLab#

Objectives📍

  • fork

  • merge requests

  • gitlab for project management

  • git LFS

Materials📓#

optional/reading/further materials#

Contents