CFEL-I Git workshop Part 2 - Rise of the Merge Conflict

Tuesday 16 Jan 2024, 13:00 → 15:00 Europe/Berlin

SR V O1.109 Wolfgang Pauli (CFEL)

Ivan De Gennaro Aquino (FS-CFEL-1 (Forschung mit Photonen Experimente 1))

Hi all,

git gets dirty this time. Building up on our gitlab experience from Part 1b, you will work in pairs on the same repository and experience - in a guided way - some of the typical problems that occur in git-collaboration.