From 0e269b33b5d362010325ab0dff5b6ca803d2cc0e Mon Sep 17 00:00:00 2001
From: "Haupt, Carina" <carina.haupt@dlr.de>
Date: Mon, 31 Aug 2020 18:58:48 +0200
Subject: [PATCH 1/5] Added git clone. #3
---
episodes/10-collaboration-with-others.md | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/episodes/10-collaboration-with-others.md b/episodes/10-collaboration-with-others.md
index 7fac9a7..ef40a9e 100644
--- a/episodes/10-collaboration-with-others.md
+++ b/episodes/10-collaboration-with-others.md
@@ -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:
+We simulate this step by cloning the remote Git repository.
+- Clone 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:
--
GitLab
From dda4a86237b102eb026bca864c79f960b5a93f26 Mon Sep 17 00:00:00 2001
From: "Haupt, Carina" <carina.haupt@dlr.de>
Date: Mon, 31 Aug 2020 18:59:35 +0200
Subject: [PATCH 2/5] Fixed reference to episode 9 (was 8)
---
episodes/10-collaboration-with-others.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/episodes/10-collaboration-with-others.md b/episodes/10-collaboration-with-others.md
index ef40a9e..c90b173 100644
--- a/episodes/10-collaboration-with-others.md
+++ b/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.
--
GitLab
From 53c47a29da0853f590b48ef2346459e67a74af2b Mon Sep 17 00:00:00 2001
From: "Haupt, Carina" <carina.haupt@dlr.de>
Date: Mon, 31 Aug 2020 19:00:21 +0200
Subject: [PATCH 3/5] Removed git clone section from episode 9 (now in episode
10). #3
---
episodes/09-remotes-in-gitlab.md | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/episodes/09-remotes-in-gitlab.md b/episodes/09-remotes-in-gitlab.md
index 30ae9a9..cfe32a8 100644
--- a/episodes/09-remotes-in-gitlab.md
+++ b/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!
--
GitLab
From 7a539a16b7a20058b803ea1f1403f5228df0c24d Mon Sep 17 00:00:00 2001
From: "Haupt, Carina" <carina.haupt@dlr.de>
Date: Mon, 31 Aug 2020 19:27:14 +0200
Subject: [PATCH 4/5] Moved WIP removal to collaborator section
---
episodes/10-collaboration-with-others.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/episodes/10-collaboration-with-others.md b/episodes/10-collaboration-with-others.md
index c90b173..30d8e91 100644
--- a/episodes/10-collaboration-with-others.md
+++ b/episodes/10-collaboration-with-others.md
@@ -49,6 +49,7 @@ We simulate this step by cloning the remote 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)
@@ -62,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)
--
GitLab
From f97fdaf0634d207dc608031d3387d6a30a218b62 Mon Sep 17 00:00:00 2001
From: Tobias Schlauch <tobias.schlauch@dlr.de>
Date: Tue, 1 Sep 2020 06:37:31 +0000
Subject: [PATCH 5/5] Add a new line
---
episodes/10-collaboration-with-others.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/episodes/10-collaboration-with-others.md b/episodes/10-collaboration-with-others.md
index 30d8e91..f555e46 100644
--- a/episodes/10-collaboration-with-others.md
+++ b/episodes/10-collaboration-with-others.md
@@ -22,8 +22,8 @@ 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 cloning the remote Git repository.
-- Clone remote 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:
--
GitLab