diff --git a/.gitignore b/.gitignore index 72598cf3d625708f0d20916694db5a314d71c95c..ea3707a8ba9ded677c7922ded19397f2ffee8693 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.ai site/ courses.lcsb.uni.lu index.html diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/branches.md b/2022/2022-05-31_git-trilogy-part-1/slides/branches.md index a13c2376b5076de940438e4cc5b659869d3a79c6..712173397c1a1db3a0552b61a3c14b80985aef04 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/branches.md +++ b/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 + + Why is it best practice to branch off from `develop`? \ No newline at end of file diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/forks.md b/2022/2022-05-31_git-trilogy-part-1/slides/forks.md index f958de248538688433e3f2fd35197eeab3fde2a9..a778f65bbd610465c1d52ecb7cad345fa71b50f3 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/forks.md +++ b/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>. 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 2766afcd85681944c3927a7ee18c8bea05b209cc..f36b003e4a54b16b850ddf5c88a63489c49cbd1f 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 @@ -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) diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/branch_GUI_switch.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/branch_GUI_switch.png index 56262a57ae632d36c42f2de264cc84b5f0d3fe04..025ba5da34d35abecee4901133634dcd5056f2f2 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/branch_GUI_switch.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/branch_GUI_switch.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/commit_GUI_web-ide.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/commit_GUI_web-ide.png index aad56872ebf82491c05ef05578b1746bfd4a43ec..0891d44db40a3f9127ca1f0234106d9acfc1fcc0 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/commit_GUI_web-ide.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/commit_GUI_web-ide.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png index e505ba66abad7597fd9fd710941b3311115b3b7b..9b2cc2475efff822f8eff39d8b810efad1c8e6f3 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png index 15bbcd61416a91b0cb346d79520dcbf702aacf9d..ee32953aa2c028088d422424cae11f0fe57e448e 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png index 09e317784ad2a2bcb2a0e5b08cf8ecc06eeb4602..99f25a1a3140d044c2c5954f4162f6d8780ecea5 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png index f92a2e5130dc5f5480607a8eb2272364901467a8..4a974d117c286990688cc29fb7eb19c9efabdde0 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_edit-file.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_edit-file.png index 5bb18125fc8d764d0183985a6799877630580cfc..bf5f4d1acbed2cd79579c4dd930ba1ddc70611ef 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_edit-file.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_edit-file.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_select-branch.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_select-branch.png index caa399874d6d86f038235f1a13211b29d833d980..9ebef3460496902df4fd2e1cd5457f9e4bff0b0f 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_select-branch.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/web-ide_select-branch.png differ 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 e71182f1b6a9c2aa3f6bf26fd01281a7dd538f50..204482b5c233171a89f661f211a463cca0c33509 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 @@ -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> diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md b/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md index e9fa7c83ed6828ab3904cd847703f25123f34450..53b1415c53bee230d4d280412a4a476fc7facf88 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md +++ b/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md @@ -1,17 +1,20 @@ # 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*. diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/web-ide.md b/2022/2022-05-31_git-trilogy-part-1/slides/web-ide.md index 063101298f037b739f1a4ad117aa0dd3613ac5ad..f900de0871070ff24d307a1210005dd0c1eba303 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/web-ide.md +++ b/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"> diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md b/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md index a28044617a900af92461e7d1133c68198b99b513..62bf14050d51f0d7c17ad4d1ed75e070aee141b9 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md +++ b/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: