From 96a85e81e744b5f8002b6a9ddfbd3feb282c9359 Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Mon, 30 May 2022 19:03:34 +0200
Subject: [PATCH] changes to part 1 (1)
---
.../slides/best_practices.md | 40 ++++---------------
.../slides/gitlab.md | 7 ++--
.../slides/merge.md | 27 ++++---------
.../slides/syncFork.md | 19 ++++++++-
4 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/best_practices.md b/2022/2022-05-31_git-trilogy-part-1/slides/best_practices.md
index f430fdfa..c20cfef1 100644
--- a/2022/2022-05-31_git-trilogy-part-1/slides/best_practices.md
+++ b/2022/2022-05-31_git-trilogy-part-1/slides/best_practices.md
@@ -1,41 +1,15 @@
-# Wrap-up
+# Summary
-* Git makes things separated but interlinked!
- * separation of changes into commits - compare with standard "versioning" of dropbox/onedrive/owncloud or labeling v1.2 manually
- * separation of work into branches - compare with standard work in parallel - making copy of file and renaming, then "putting it together"
- * separation of work into forks - compare with "I will make my own copy of the whole folder"
+GitLab creates a convenient and efficient working environment
+ - merge requests
+ - issues
+ - assignments
+ - much much more...
-<div class="fragment">
-* GitLab creates a convenient working environment
- * merge requests
- * issues
- * assignements
- * and much much more...
-
-
- <div style="position:absolute;left:55%;top:55%">
- <img src="slides/img/fox.png">
- https://pixabay.com/images/id-5236832/
- </div>
-</div>
-
-
-
-
-# Wrap-up
-## Glossary
-* git
-* repository
-* fork
-* commit
-* branch
-* merge
-* merge/pull request
-
-## Best practices
+# Best practices
* Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop`
* Do **not commit** to `master`/`develop`, but **submit a merge request (MR)**
diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/gitlab.md b/2022/2022-05-31_git-trilogy-part-1/slides/gitlab.md
index e33663a5..2766afcd 100644
--- a/2022/2022-05-31_git-trilogy-part-1/slides/gitlab.md
+++ b/2022/2022-05-31_git-trilogy-part-1/slides/gitlab.md
@@ -1,4 +1,5 @@
# Git repository hosting platforms
+
<div style="position:absolute; left:70%">
<img src="https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-extra-whitespace.png" alt="GitLab" style="width: 500px;"/>
</div>
@@ -22,9 +23,7 @@ Another popular platforms:
-# Time to practice!
-
-<img src="slides/img/icon-live-demo.png" height="100px">
+# Login and report and issue
1. Login to [https://gitlab.lcsb.uni.lu](https://gitlab.lcsb.uni.lu)
* use your LUMS credentials
@@ -34,3 +33,5 @@ Another popular platforms:
3. Inspect project/repository folder structure
4. Report an issue
+<img src="slides/img/icon-live-demo.png" height="100px">
+
diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/merge.md b/2022/2022-05-31_git-trilogy-part-1/slides/merge.md
index 5d7ba1a9..e71182f1 100644
--- a/2022/2022-05-31_git-trilogy-part-1/slides/merge.md
+++ b/2022/2022-05-31_git-trilogy-part-1/slides/merge.md
@@ -28,27 +28,14 @@ You have to <font color="color:red">merge</font> the branches.
-# Time to practice!
+# Merge request (MR)
-* After hitting the Commit button, you get redirected to the submission page for your merge request
-* Please make sure that you see that you are proposing to merge your branch (version) into the develop branch. This is shown at the top of the page:
-<!-- .element: class="fragment" data-fragment-index="1" -->
-* Fill your merge request submission form and select an Assignee.
-<!-- .element: class="fragment" data-fragment-index="3" -->
-* Good practice is to select Delete source branch when merge request is accepted. (Why?)
-<!-- .element: class="fragment" data-fragment-index="4" -->
-* Under Changes tab, you can see your... changes :)
-<!-- .element: class="fragment" data-fragment-index="5" -->
+<img src="slides/img/icon-live-demo.png" height="100px">
+After hitting the *Commit* button, you get redirected to the submission page for your *merge request (MR)*
-<div style="position:absolute;left:30%;top:4em" class="fragment fade-in-then-out" data-fragment-index="1">
-<img src="slides/img/merge_GUI_detail.png" height="720px" >
-</div>
-
-<div style="position:absolute;left:30%;top:6em" class="fragment fade-in-then-out" data-fragment-index="2">
-<img src="slides/img/merge_branch-to-branch.png" height="100px" >
-</div>
+* Propose to merge your branch into the *development branch*. This is shown at the top of the page.
+* Fill your merge request submission form and select an *Assignee*.
+* Under Changes tab, you can see your changes
-<div style="position:absolute;left:5%;top:10em" class="fragment fade-in-then-out" data-fragment-index="5">
-<img src="slides/img/merge_changes.png" height="400px" >
-</div>
+ Good practice is to select *Delete source branch when merge request is accepted*. Why?
diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/syncFork.md b/2022/2022-05-31_git-trilogy-part-1/slides/syncFork.md
index 52f36f8a..1b3ef3de 100644
--- a/2022/2022-05-31_git-trilogy-part-1/slides/syncFork.md
+++ b/2022/2022-05-31_git-trilogy-part-1/slides/syncFork.md
@@ -1,4 +1,19 @@
# Synchronize your fork
-<!-- TODO: do we need this slide? -->
-<!-- Should it contain steps for deleting a branch -->
\ No newline at end of file
+As mentioned earlier, your fork has been created a certain moment in time.
+
+How to keep it updated?
+
+## Easy way
+
+Delete your fork and re-create it!
+
+- Go to `Settings > General`
+- Scroll down to the `Advanced` section and expand it
+- Click on `Delete this project` and follow the on-screen instructions
+
+ Before you do this, please make sure that all your merge requests have been accepted.
+
+## Automatic way
+
+Follow the instructions on the How-To card: [https://howto.lcsb.uni.lu/?contribute:mirror-fork](https://howto.lcsb.uni.lu/?contribute:mirror-fork)
\ No newline at end of file
--
GitLab