Merge branch 'review-part-1' into 'develop'

Review part 1

See merge request !127

.gitignore

+*.ai
 site/
 courses.lcsb.uni.lu
 index.html

2022/2022-05-31_git-trilogy-part-1/slides/branches.md

@@ -77,10 +77,12 @@ What is the difference between a *fork* and a *branch*?
 
 
 
+
 # How to switch between branches?
 
-<div style="position:absolute;left:10%;top:8em">
+<div align="center">
 <img src="slides/img/branch_GUI_switch.png" height="500em"/>
 </div>
 
-Why is best practice to branch off from `develop`?
+
\ No newline at end of file
+![bulb](slides/img/bulb.png) Why is it best practice to branch off from `develop`?
\ No newline at end of file

2022/2022-05-31_git-trilogy-part-1/slides/forks.md

@@ -4,7 +4,6 @@
 <center>
 <img src="slides/img/fork.jpg" class="as-is" height="500em"/>
 </center>
-<!--http://www.cndajin.com/data/wls/246/22302193.jpg-->
 
 
 
@@ -23,8 +22,9 @@
 - In general, by default, you can only **read** files in a repository. You **cannot write**.
 
 <div class="fragment">
-<img src="slides/img/forking.png" height="400px">
-
+<div align="center">
+<img src="slides/img/forking.png" width="80%">
+</div>
 
 - You have to work on your **own copy** of the repository in order to make changes.
 - In other words, you have to work on your own <font color="red">**fork**</font>.

2022/2022-05-31_git-trilogy-part-1/slides/gitlab.md

@@ -16,7 +16,7 @@ Web-based platforms with **many** features facilitating storing, tracking and co
 - Public GitLab: [https://gitlab.com](https://gitlab.com)
 - **LCSB** specific: [https://gitlab.lcsb.uni.lu](https://gitlab.lcsb.uni.lu)
 
-Another popular platforms:
+Other popular platforms:
 - **GitHub**: [https://github.com](https://github.com)
 - **BitBucket**: [https://bitbucket.org](https://bitbucket.org)
 - **Gitea**: [https://gitea.io](https://gitea.io)

2022/2022-05-31_git-trilogy-part-1/slides/merge.md

@@ -17,12 +17,15 @@ You have to <font color="color:red">merge</font> the branches.
 
 # What happened in the background?
 
-<div style="position:absolute;top:2em" class="fragment fade-in-then-out" data-fragment-index="1">
+<div align="center">
 <img src="slides/img/fork_branch-diagram-after-commit.png" height="600px" >
 </div>
 
 
-<div style="position:absolute;top:2em" class="fragment fade-in-then-out" data-fragment-index="1">
+
+# What happened in the background?
+
+<div align="center">
 <img src="slides/img/fork_branch-diagram-after-commit-with-back-arrow.png" height="600px" >
 </div>
 

2022/2022-05-31_git-trilogy-part-1/slides/versioning.md

 # Why use a version control system?
 
-Basic feature:
+Basic features:
 
-* Ability to recover old versions
+* Maintain different versions of documents or code
+* Ability to recover previous versions
+* Track all changes to a document or code
 
 <div style="position:absolute; left:50%">
 <img src="slides/img/version-history_OneDrive.png" height="650px">
 </div>
 
 Common tools you are already using supporting "version control":
-- Owncloud
-- OneDrive
-- ...
+
+* Owncloud
+* OneDrive
+* ...
 
 From the list of files, it is clear *who* changed which file and *when*.
 

2022/2022-05-31_git-trilogy-part-1/slides/web-ide.md

@@ -19,11 +19,11 @@ To change content of a file:
 
 
 <div style="position:absolute;left:30%;top:1em" class="fragment fade-in-then-out" data-fragment-index="1">
-<img src="slides/img/commit_GUI_web-ide.png" width="90%" >
+<img src="slides/img/commit_GUI_web-ide.png" width="95%" >
 </div>
 
 <div style="position:absolute;left:40%;top:1em" class="fragment fade-in-then-out" data-fragment-index="2">
-<img src="slides/img/web-ide_select-branch.png" width="90%" >
+<img src="slides/img/web-ide_select-branch.png" width="60%" >
 </div>
 
 <div style="position:absolute;left:33%;top:1em" class="fragment fade-in-then-out" data-fragment-index="3">

2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md

@@ -37,8 +37,8 @@ Linus Torvalds (2007-06-14)
 * Annotate each change with description
 * **Backtrack** (if necessary) and undo unwanted changes
 * Contribute content in parallel
-* Easily **add contributions** of your collaborators to the any version
-</div>
+* Easily **add contributions** of your collaborators to any version
+
 
 note: