From e38b051f99b6f0b061d6241a923e3d2f89142f30 Mon Sep 17 00:00:00 2001 From: laurentheirendt <laurent.heirendt@uni.lu> Date: Tue, 31 May 2022 07:50:21 +0200 Subject: [PATCH] minor changes and typos --- 2022/2022-05-31_git-trilogy-part-1/slides/gitlab.md | 2 +- .../slides/versioning.md | 13 ++++++++----- .../slides/what_is_git.md | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) 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 2766afcd..f36b003e 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/versioning.md b/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md index e9fa7c83..53b1415c 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/what_is_git.md b/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md index a2804461..62bf1405 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: -- GitLab