Skip to content
Extraits de code Groupes Projets
Valider ca7f0b97 rédigé par Pierre-Yves Barriat's avatar Pierre-Yves Barriat
Parcourir les fichiers

Upgrade git 2025

parent 44d7fddd
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -5,10 +5,10 @@ It is very simple, only consists in a HTML file and a CSS file and you will have ...@@ -5,10 +5,10 @@ It is very simple, only consists in a HTML file and a CSS file and you will have
In this tutorial you will learn how to make commits in the Git project, to create several branches, to push things to GitHub, and to follow a standard procedure to develop collaboratively. Afterwards, you should apply the same methods to any other collaborative development inside your department. The objectives will be achieved gradually following these topics: In this tutorial you will learn how to make commits in the Git project, to create several branches, to push things to GitHub, and to follow a standard procedure to develop collaboratively. Afterwards, you should apply the same methods to any other collaborative development inside your department. The objectives will be achieved gradually following these topics:
1. [Set up your working environment](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/working_environment) 1. [Set up your working environment](https://forge.uclouvain.be/elic/learning/-/tree/main/learning-git/project/windows/working_environment)
2. [Prepare issues](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/issues) 2. [Prepare issues on Gogs](https://forge.uclouvain.be/elic/learning/-/tree/main/learning-git/project/windows/gogs_issues)
3. [Prepare branches](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/branches) 3. [Prepare branches](https://forge.uclouvain.be/elic/learning/-/tree/main/learning-git/project/windows/branches)
4. [Add new content](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/functions) 4. [Add new functions](https://forge.uclouvain.be/elic/learning/-/tree/main/learning-git/project/windows/functions)
5. [Create pull request](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_request) 5. [Create pull request](https://forge.uclouvain.be/elic/learning/-/tree/main/learning-git/project/windows/pull_request)
6. [Review and test others' branches](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/review) 6. [Review and test others' branches](https://forge.uclouvain.be/elic/learning/-/tree/main/learning-git/project/windows/review)
7. [Pull master changes](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_master) 7. [Pull master changes](https://forge.uclouvain.be/elic/learning/-/tree/main/learning-git/project/windows/pull_master)
...@@ -15,7 +15,7 @@ Cloning into 'learning-git'... ...@@ -15,7 +15,7 @@ Cloning into 'learning-git'...
Username for 'https://forge.uclouvain.be': barriat Username for 'https://forge.uclouvain.be': barriat
Password for 'https://barriat@forge.uclouvain.be': Password for 'https://barriat@forge.uclouvain.be':
remote: HTTP Basic: Access denied. The provided password or token is incorrect or your account has 2FA enabled and you must use a personal access token instead of a password. See https://forge.uclouvain.be/help/topics/git/troubleshooting_git#error-on-git-fetch-http-basic-access-denied remote: HTTP Basic: Access denied. The provided password or token is incorrect or your account has 2FA enabled and you must use a personal access token instead of a password. See https://forge.uclouvain.be/help/topics/git/troubleshooting_git#error-on-git-fetch-http-basic-access-denied
fatal: Authentication failed for 'https://forge.uclouvain.be/barriat/learning-git.git/' fatal: Authentication failed for 'https://forge.uclouvain.be/elic/learning.git/'
``` ```
You must create and use a token: You must create and use a token:
......
...@@ -7,13 +7,13 @@ Cloning into 'learning-git'... ...@@ -7,13 +7,13 @@ Cloning into 'learning-git'...
Username for 'https://forge.uclouvain.be': barriat Username for 'https://forge.uclouvain.be': barriat
Password for 'https://barriat@forge.uclouvain.be': Password for 'https://barriat@forge.uclouvain.be':
remote: HTTP Basic: Access denied. The provided password or token is incorrect or your account has 2FA enabled and you must use a personal access token instead of a password. See https://forge.uclouvain.be/help/topics/git/troubleshooting_git#error-on-git-fetch-http-basic-access-denied remote: HTTP Basic: Access denied. The provided password or token is incorrect or your account has 2FA enabled and you must use a personal access token instead of a password. See https://forge.uclouvain.be/help/topics/git/troubleshooting_git#error-on-git-fetch-http-basic-access-denied
fatal: Authentication failed for 'https://forge.uclouvain.be/barriat/learning-git.git/' fatal: Authentication failed for 'https://forge.uclouvain.be/elic/learning.git/'
``` ```
You must create and use a token. Instead of: You must create and use a token. Instead of:
```bash ```bash
git clone https://forge.uclouvain.be/barriat/learning-gitlab.git git clone https://forge.uclouvain.be/elic/learning.git
Username for 'https://forge.uclouvain.be': <UCLouvain_username> Username for 'https://forge.uclouvain.be': <UCLouvain_username>
Password for 'https://barriat@forge.uclouvain.be': <UCLouvain_password> Password for 'https://barriat@forge.uclouvain.be': <UCLouvain_password>
``` ```
...@@ -21,7 +21,7 @@ Password for 'https://barriat@forge.uclouvain.be': <UCLouvain_password> ...@@ -21,7 +21,7 @@ Password for 'https://barriat@forge.uclouvain.be': <UCLouvain_password>
Use: Use:
```bash ```bash
git clone https://forge.uclouvain.be/barriat/learning-gitlab.git git clone https://forge.uclouvain.be/elic/learning.git
Username for 'https://forge.uclouvain.be': <UCLouvain_username> Username for 'https://forge.uclouvain.be': <UCLouvain_username>
Password for 'https://barriat@forge.uclouvain.be': <a_token> Password for 'https://barriat@forge.uclouvain.be': <a_token>
``` ```
...@@ -32,7 +32,7 @@ So first, create a token for your repository. See the 4 steps below: ...@@ -32,7 +32,7 @@ So first, create a token for your repository. See the 4 steps below:
||| |||
| -------- | -------- | | -------- | -------- |
|![token_2.png](./img/token_2.png) |![token_3.png](./img/token_3.png) | |![token_2.png](./img/token_2.png) |![token_3.png](./img/token_4.png) |
|![token_4.png](./img/token_4.png) |![token_5.png](./img/token_5.png) | |![token_4.png](./img/token_5.png) | |
Once done, you can now clone the repository (and pull/push in it) with your username and the "key token" instead of your account's password. Once done, you can now clone the repository (and pull/push in it) with your username and the "key token" instead of your account's password.
\ No newline at end of file
...@@ -5,7 +5,7 @@ author: P.Y. Barriat ...@@ -5,7 +5,7 @@ author: P.Y. Barriat
#description: https://dev.to/nikolab/complete-list-of-github-markdown-emoji-markup-5aia #description: https://dev.to/nikolab/complete-list-of-github-markdown-emoji-markup-5aia
backgroundImage: url('assets/back.png') backgroundImage: url('assets/back.png')
_backgroundImage: url('assets/garde.png') _backgroundImage: url('assets/garde.png')
footer: 19/04/2024 | Version control with Git footer: 20/05/2025 | Version control with Git
_footer: "" _footer: ""
paginate: true paginate: true
_paginate: false _paginate: false
...@@ -14,14 +14,12 @@ _paginate: false ...@@ -14,14 +14,12 @@ _paginate: false
Version control with `git` for scientists <!--fit--> Version control with `git` for scientists <!--fit-->
=== ===
https://forge.uclouvain.be/barriat/learning-git https://forge.uclouvain.be/elic/learning.git
![h:150](assets/git.png) ![h:150](assets/git.png)
**Pierre-Yves Barriat & François Massonnet** **Pierre-Yves Barriat & François Massonnet**
ACELI Training Sessions `April 19th, 2024` ACELI Training Sessions `May 20th, 2025`
###### some parts inspired on slides from CISM
--- ---
...@@ -219,7 +217,7 @@ To use `git` in VSCode, first make sure you have `git` [installed on your comput ...@@ -219,7 +217,7 @@ To use `git` in VSCode, first make sure you have `git` [installed on your comput
>create a local working copy of a remote repository >create a local working copy of a remote repository
```bash ```bash
git clone https://forge.uclouvain.be/barriat/learning-git git clone https://forge.uclouvain.be/elic/learning.git
``` ```
**add** & **commit** **add** & **commit**
...@@ -309,9 +307,9 @@ git config --global core.editor "vim" ...@@ -309,9 +307,9 @@ git config --global core.editor "vim"
git config --list git config --list
``` ```
Now, clone https://forge.uclouvain.be/barriat/learning-git Now, clone https://forge.uclouvain.be/elic/learning.git
> Theses are very simple exercices to learn to manipulate git. > Theses are very simple exercices to learn to manipulate git.
> In each folder, simply run `./create.sh` and follow the guide :sunglasses: > In each folder, simply run `./create.sh` in `learning-git` folder, and follow the guide :sunglasses:
--- ---
......
Aucun aperçu pour ce type de fichier
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter