Merge branch '3-rune-episode-10-collaboration' into 'master'

Tune collaboration episode

Closes #3

See merge request hifis/hifis-workshops/introduction-to-git-and-gitlab/workshop-material!2

episodes/09-remotes-in-gitlab.md

@@ -66,16 +66,6 @@ Please see the original episodes for further details about the introduced topics
   - Explain that `--tags` will push all tags at once
   - Explain that `v1.0`, `HEAD`, a commit ID and a branch name can refer to the same commit
 
-## Remove the Local Repository and Download it again
-
-- Use `git log --oneline` to verify that `origin` has all commits
-- Add `pluto.txt` to the local Git repository with the line `No risk of surprise visits` but **do not** commit & push.
-- Delete the local Git repository: `cd .. && rm -rf planets` or close Shell and delete in Explorer
-- [Puzzle `git clone` command together from Git docs (`<repository> [<directory>]`)](https://git-scm.com/docs/git-clone) **Result:** `git clone https://gitlab.com/<USERNAME>/planets`
-  - Ignore most `[--flags]` until you need them
-  - Maybe mention option `--depth N` for large, long-running projects
-- Demonstrate that entire project history is retrievable, but the uncommitted/unpushed changes are lost
-
 ## Key Points
 
 - Local copy is backup of remote => Different local backup needed!

episodes/10-collaboration-with-others.md

@@ -6,7 +6,7 @@ SPDX-License-Identifier: CC-BY-4.0
 
 # Collaboration with Others
 
-In [episode 8](08-remotes-in-gitlab.md), you already learnt about contributing changes via the local Git repository and the GitLab Web interface.
+In [episode 9](09-remotes-in-gitlab.md), you already learnt about contributing changes via the local Git repository and the GitLab Web interface.
 In this episode, we show you how you can collaborate with other persons on the basis of [Git branches](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) and [GitLab Merge Requests](https://docs.gitlab.com/ee/user/project/merge_requests/getting_started.html).
 [branching.pptx](episodes/extras/branching.pptx) provides a summary of the performed steps.
 
@@ -22,8 +22,11 @@ For that purpose, you can add [new collaborators to the `planets` GitLab project
 ## Create a new Contribution (Collaborator View)
 
 In the following, we work from the collaborator's point of view and want to contribute basic project documentation.
-We simulate this step by switching back to our local Git repository.
-- Show current state of the local Git repository:
+
+- Clone the remote Git repository:
+   - `git clone <REMOTE URL>`
+   - Show where to retrieve URL from in Gitlab
+- Show current state of the cloned local Git repository:
    - `git graph`
    - Highlight current branches
 - Create and switch to a local branch:
@@ -46,6 +49,7 @@ We simulate this step by switching back to our local Git repository.
    - Add a **good** title: `Add repository documentation`
    - Explain what can be put into the description (e.g., checklists for developer and reviewer)
    - Mention that merge requests can be created from issue tracker
+   - Remove `WIP` (work in progress status) as last step to show collaboration is done.
 
 ## Review the Contribution (Owner View)
 
@@ -59,7 +63,6 @@ Now, we switch into the role of the project owner (you) and review the contribut
   - Show how to interact via comments
   - Show `Insert suggestion` functionality
 - Merge changes into `master`:
-  - Remove `WIP` (work in progress status)
   - Click the `Merge` button
 
 ## Pull Changes (Collaborator View)