Advanced training slides

added 3 commits

added 6 commits

5639f48a - slide for reverting a commit
46164b0c - new images for rebase
dbdef34d - fix slides of rebase
c3ce4d6a - example 2 of rebase
75163cf0 - adapt the slides for cherr-picking
31c46285 - overall changes to fit partial cherry-picking and note on common commands

added 4 commits

82911dea - redo merge slide
94a4f27b - installation instructions for kdiff3, and example for solving conflict on local merge
016c2753 - add example for cherry-picking a conflict
2ef04024 - changes in config of kdiff3

unmarked as a Work In Progress

enabled an automatic merge when the pipeline for 2ef04024 succeeds

merged

mentioned in commit 8b563ae0

Merge request reports