Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3school/git.slides!37

slides/installation.md

@@ -21,7 +21,7 @@ $ sudo apt-get install git-all
 
 ## How to get started?
 
-**Linux (Ubuntu)** and **macOS**
+**macOS**
 
 Start the `Terminal` or `iTerm`.
 
@@ -30,6 +30,11 @@ Start the `Terminal` or `iTerm`.
 
 Start `GUI Bash`.
 
+<br>
+**Linux (Ubuntu)**
+
+Start the `Terminal` or `Terminator`.
+
 
 ## Is `git` properly installed?
 

slides/merge.md

+## Pull and merge requests
 
-## Merge a branch
-
-If you want your feature on the `develop` or `master` branches,
+If you want your changes to be reflected on the `develop` or `master` branches,
 **submit a MR or a PR** via the Github/Gitlab interface.
 
 <br>
@@ -9,35 +8,10 @@ Use the **interface** to make use of your peers to review your code!
 
 <img src="img/branch-merge.png" class="branch-merge" />
 
+
 <br>
 Once merged, you can delete the branch via the interface.
 
-
-## Github interface
-<img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="width: 100px;"/>
-
+<div class="fragment">
+<br>
+<img src="img/icon-live-demo.png" height="100px">
\ No newline at end of file
-Detailed information is on [help.github.com/articles/creating-a-pull-request/](https://help.github.com/articles/creating-a-pull-request/).
-
-1. Click on **New pull request**
-
-![New pull request](https://help.github.com/assets/images/help/pull_requests/pull-request-start-review-button.png)
-<br><br>
-2. Compare the branches
-
-![Compare branches](https://help.github.com/assets/images/help/pull_requests/choose-base-and-compare-branches.png)
-
-
-<ol start="3">
-  <li>Assign your peer
-  <br>
-
-  ![Assigning a peer](https://help.github.com/assets/images/help/issues/issues_assigning_dropdown.png)
-  </li>
-</ol>
-
-
-<ol start="4">
-  <li>Submit the PR
-
-  ![Submit MR](https://help.github.com/assets/images/help/pull_requests/pullrequest-send.png)</li>
-</ol>

slides/overview.md

@@ -2,10 +2,15 @@
 
 0. The terminal
 1. The editor
-1. What is `git`? What is the use of `git`? <!--(5 min)//-->
-2. GitHub and GitLab <!--(5min)//-->
+2. What is `git`? What is the use of `git`? <!--(5 min)//-->
 3. Installation of `git`
-4. The 5 essential commands <!--(10 min)//-->
+4. GitHub and GitLab <!--(5min)//-->
+5. How do I configure `git`? <!--(5min)//-->
+6. Where and how to start <!--(5min)//-->
+7. What is a fork? <!--(5min)//-->
+8. What are branches?
+9. The 5 essential commands <!--(10 min)//-->
     * `pull` / `status` / `add` / `commit` / `push`
-5. Branches <!--(10 min)//-->
-7. Best practices
+10. What are merge/pull requests? <!--(10 min)//-->
+11. How do I synchronize my fork?
+12. Best practices
\ No newline at end of file

slides/syncFork.md

@@ -37,11 +37,6 @@ $ git push origin master
 ```
 
 <div class="fragment">
-<br>
-Do the same for the `develop` branch<br>
-(replace `master` with `develop`).
-
-
-## Time to practice!
+Do the same for the `develop` branch.
 
-(Live Demo)
+<img src="img/icon-live-demo.png" height="100px">
\ No newline at end of file

slides/thanks.md

@@ -30,3 +30,12 @@ https://git-scm.com/book/en/v2
 
 <br>[3]: Cheat sheet: http://rogerdudler.github.io/git-guide
 
+
+## Thank you.
+
+<img src="img/r3-training-logo.png" height="200px">
+
+Contact us if you need help:
+
+r3lab.core@uni.lu
+

slides/the_editor.md

@@ -8,4 +8,4 @@ Recommended editors:
 
 ## Visual Studio Code
 
-<br>(Live Demo)
+<br><img src="img/icon-live-demo.png" height="100px">
\ No newline at end of file

slides/the_terminal.md

@@ -43,7 +43,7 @@ in your home directory (unless otherwise configured), denoted as `~/`.
 
 List the contents of a directory
 ```bash
-$ ls
+$ ls #-lash
 ```
 
 <div class="fragment">

slides/what_is_git.md

@@ -11,7 +11,7 @@
 <div align="left"><small>[1] *https://en.wikipedia.org/wiki/Git*</small></div>
 
 
-## Funny story
+## The inventor of `git`
 
 ![](img/git_definition.png)
 <br><br>