revision of fork and workflow

2022/2022-06-07_git-trilogy-part-2/slides/fork.md

-# Create your copy on server - fork
+# Fork the upstream repository
 
-As you already know it is not nice to work on original repository. 
 
-You need to create a copy of the repository for yourself.
+If you recently contributed to the upstream repository, please delete the fork and start over
 
-In git words: you need to *fork*  repository.<br><br>
+<div class="fragment">
+<br>
+If you do not have write access to the `upstream` repository, you have to fork it (as seen in the previous course):
 
-Go to [https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages](https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages) and fork
-    
-- make it public or private depending on orginal repository) 
+- make it `public` or `private` depending on upstream repository
 - select your namespace
 
-<img height="330px" src="slides/img/fork.png">
+<center>
+<img width="50%" src="slides/img/fork.png">
+</center>
+
+<img src="slides/img/icon-live-demo.png" height="100px"> Go to [https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages](https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages) and fork.
\ No newline at end of file

2022/2022-06-07_git-trilogy-part-2/slides/img/icon-live-demo.png

+../../../../2020/2020-03-30_basicGitTraining/slides/img/icon-live-demo.png
\ No newline at end of file

2022/2022-06-07_git-trilogy-part-2/slides/workflow.md

-# Typical workflow
+# Typical workflow (revisited)
 
-- Create your copy of original repository (*fork* in git words)
-- Download your copy to your computer (*clone* in git words)
+- Create your own copy of the original (also called `upstream`) repository (`fork` in `git` jargon)
+- Download your copy to your computer (`clone` in `git` jargon)
 - Create a new brach
 - Make changes
 - Commit changes
-- Create merge request to original repository
+- <font color="red">Push changes to server</font>
+- Create merge request to upstream repository
 
-<img height="500px" src="slides/img/fork_branch-diagram-after-commit-with-back-arrow.png">
\ No newline at end of file
+<center>
+<img width="60%" src="slides/img/fork_branch-diagram-after-commit-with-back-arrow.png">
+</center>
\ No newline at end of file