Workshop on GIT including merging, reverting and branching with merges