diff --git a/learning-git/slides/slides.md b/learning-git/slides/slides.md index e648d514c98a0eaa544c0b3f79349aec4757b5b2..b19d29f2ed1bcdc9f971459fd3fa70d82005bdfa 100644 --- a/learning-git/slides/slides.md +++ b/learning-git/slides/slides.md @@ -135,23 +135,25 @@ pie --- -# ... and `GitLab` vs `GitHub` vs others +# ... and `GitLab` -`GitLab` is an alternative to `GitHub` +`GitLab` is an open-source self-hosted alternative to `GitHub` > `GitLab` is free for unlimited private projects. `GitHub` doesn't provide private projects for free -And for **ELIC**, `Gogs` does the job: https://gogs.elic.ucl.ac.be/ -- shares the same features - > dashboard, file browser, issue tracking, groups support, webhooks, etc -- easy to install, cross-platform friendly -- uses little memory, uses little CPU power -- ... and 100% free :smile: +The **UCLouvain Forge** is a `GitLab` instance: https://forge.uclouvain.be/ + +Shares the same features : dashboard, file browser, issue tracking, groups support, CI/CD, etc + +> `GitLab`: comprehensive DevOps platform, integrated CI/CD, and security features +> `GitHub`: user-friendly interface, robust collaboration tools, and extensive community support <!-- Notes for presenter. --> <!-- Les goÃŧts et les couleurs --> +<!-- _footer: "" --> + --- # `git` workflow @@ -230,6 +232,8 @@ git add <filename> git commit -m "Commit message" ``` +<!-- _footer: "" --> + --- # commit @@ -297,7 +301,7 @@ sequenceDiagram # Simple Git Exercices First, configure your environment (just once) :construction: -> on your laptop, on your ELIC account, etc +> on your laptop, on your UCLouvain account, etc ```bash git config --global user.name "Your Name" @@ -311,6 +315,8 @@ Now, clone https://forge.uclouvain.be/elic/learning.git > Theses are very simple exercices to learn to manipulate git. > In each folder, simply run `./create.sh` in `learning-git` folder, and follow the guide :sunglasses: +<!-- _footer: "" --> + --- # `git` branches @@ -319,7 +325,7 @@ Now, clone https://forge.uclouvain.be/elic/learning.git - a **branch** can point at other commit > it can move ! - a **branch** is a way to organize your work and working histories -- since commit know which commits they are based on, **branch** represents a commit and what came before it +- since commits know which commits they are based on, **branch** represents a commit and what came before it - a branch is cheap, you can have multiple **branch** in the same repository and switch your working dir from one **branch** state to another --- @@ -355,7 +361,7 @@ graph LR; > see both local and remote branches ### branch is cheap : do it often :+1: -> branch allow to have short/long term parallel development +> branch allows to have short/long term parallel development --- @@ -475,7 +481,8 @@ pull = fetch + merge - avoid dropbox for paper / project :confounded: - do meaningful commit - do meaningful message -- `git` more complicated but the standard :smiley: +- `git` can seem complicated when you first start using it, but it is standard version control system used by nearly 95% of developers as of 2022 :smiley: +- `git` offers powerful features and flexibility that make it indispensable for collaborative software development --- diff --git a/learning-git/slides/slides_git.pdf b/learning-git/slides/slides_git.pdf index afbe8d6fa5386d8c7611c81148ff785f3488497c..a4aba467062380a039befaea84d5a1751ff5ca1a 100644 Binary files a/learning-git/slides/slides_git.pdf and b/learning-git/slides/slides_git.pdf differ