Advanced git

Course Materials for an Advanced One-Day Workshop

This repository contains the course materials for a one-day workshop titled “Advaned git” which I first gave at the Scientific Computing Center (SCC) in Karlsruhe.

Contents

Slides

• Block 1: Intro, Recap & Merging
  • 1.0 Intro [slides]
  • 1.1 Basics of git [slides]
  • 1.2 Branches & Merging [slides]
• Block 2: Best Practices: Pull / Merge Requests, Trunk-Based Development
  • 2.1 Collaboration & Merge Requests [slides]
  • 2.2 Trunk Based Development [slides]
• Block 3: CI / CD with gitlab
  • 3.1 GitLab CI / CD [slides]
• Block 4: Stashes, Cherry Picking, Patches & more
  • 4.1 Advanced Features of git [slides]
  • 4.2 Final Notes [slides]
  • Outro

Supporting Documents

• How to Setup SSH authentication for GitLab [PDF] [HTML]
• GitLab CI / CD Example Files 🤖
  • Simple
  • Complex
• Git Cheatsheet [PDF]
  • By GitHub Education

Links

• Repositories used in the Course
  • GitLab Website Template
• Guides to review & refresh your knowledge
  • https://gitimmersion.com
  • https://github.com/git-guides
  • Introduction to RStudio Git & GitHub
  • The Carpentries: Version Control with Git
• Trunk Based Development
  • https://trunkbaseddevelopment.com/
  • https://www.atlassian.com/continuous-delivery/continuous-integration/trunk-based-development
• Using git with data
  • dvc: Data Version Control
  • git lfs: Git Large File Storage
• If you have a problem
  • ohshitgit.com (🇩🇪)
  • Google: Just googling your problem is often the most useful solution

License

The contents of this course which were created by me are available under CC-BY-SA-4.0. For resources where I do not own the copyright, other licenses may apply.