review comments

2022/2022-06-14_git-trilogy-part-3/slides/best_practices.md

@@ -2,9 +2,9 @@
 
 * `pull` before `push` and, generally, before starting to work
 * Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop`
-* Do **not push** to `master`, but **submit a Pull Request (PR)**
-* Get your code **reviewed** by your peers (submit a PR!)
-* Submit a PR **often**!
+* Do **not push** to `master`, but **submit a Merge Request (MR)**
+* Get your code **reviewed** by your peers (submit a MR!)
+* Submit a MR **often**!
 * `clone` a repository, do not download the `.zip` file.
 * Do **not** combine `git` commands
    ```bash

2022/2022-06-14_git-trilogy-part-3/slides/installation.md

@@ -55,7 +55,7 @@ $ sudo apt-get install git-all
 
 **Windows**
 
-> Start `GUI Bash`.
+> Start `Git Bash`.
 
 <br>
 

2022/2022-06-14_git-trilogy-part-3/slides/syncFork.md

-# Synchronize your fork
+# Synchronize your fork (1)
 
 ![bulb](slides/img/bulb.png) Remember, we have to regularly update our own copy of the code.
 
@@ -25,6 +25,7 @@ $ git fetch upstream
 
 
 
+# Synchronize your fork (2)
 
 Merge the retrieved changes on the `master` branch:
 ```bash

2022/2022-06-14_git-trilogy-part-3/slides/the_terminal.md

@@ -2,10 +2,15 @@
 
 Starting the terminal presents itself with a line where you can enter a command
 ```bash
-cesar@myComputer>
+computerName:~ userName$
 ```
 
-Often written, for covenience, as
+Sometimes, this is written as:
+```bash
+userName@computerName>
+```
+
+Often written, for convenience, as
 ```bash
 $
 ```
@@ -24,7 +29,7 @@ $ git --version
 
 
 
-# Essential Linux commands
+# Essential Linux commands (1)
 
 List the contents of a directory
 ```bash
@@ -43,6 +48,8 @@ $ mkdir myNewDirectory
 
 
 
+# Essential Linux commands (2)
+
 Change the directory to a specific folder
 ```bash
 $ cd myNewDirectory

2022/2022-06-14_git-trilogy-part-3/slides/thingsGoWrong.md

@@ -95,4 +95,4 @@ always need to be resolved manually
 * Discards ALL commits made after the selected commit HEAD
 
 * This happens often in **practice**:
-    you pushed to a branch, then realize that you made a mistake in the commit, and want to start over.
\ No newline at end of file
+    you committed to a branch, then realize that you made a mistake in the commit, and want to start over.
\ No newline at end of file