Commit e1af3b7e authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !102
parents 2a886529 0351ce6a
Pipeline #38577 passed with stages
in 4 minutes and 13 seconds
...@@ -19,7 +19,7 @@ localroot = os.getcwd() ...@@ -19,7 +19,7 @@ localroot = os.getcwd()
# generate the index properly speaking # generate the index properly speaking
cardDirs = ["2020", "2019"] cardDirs = ["2021", "2020", "2019"]
index='' index=''
# determine first the directories # determine first the directories
......
# Best practices # Best practices
* `pull` before `push` * `pull` before `push` and, generally, before starting to work
* Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop` * Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop`
* Do **not push** to `master`, but **submit a Pull Request (PR)** * Do **not push** to `master`, but **submit a Pull Request (PR)**
* Get your code **reviewed** by your peers (submit a PR!) * Get your code **reviewed** by your peers (submit a PR!)
......
...@@ -38,7 +38,7 @@ If there are 2 files named `id_rsa`, you have an SSH key. ...@@ -38,7 +38,7 @@ If there are 2 files named `id_rsa`, you have an SSH key.
If you don’t have yet an SSH key, you have to generate one: If you don’t have yet an SSH key, you have to generate one:
```bash ```bash
$ ssh-keygen -t rsa # -b 4096 $ ssh-keygen -t rsa -b 4096
``` ```
If you set a password to your key (recommended), add it to the `ssh-agent`: If you set a password to your key (recommended), add it to the `ssh-agent`:
......
...@@ -45,6 +45,9 @@ $ cp firstnameLastname.md myName.md ...@@ -45,6 +45,9 @@ $ cp firstnameLastname.md myName.md
Then, make your changes with your favorite editor! Then, make your changes with your favorite editor!
<br><br>
Reference for markdown: https://howto.lcsb.uni.lu/?contribute:markdown
# Add your file to the stage # Add your file to the stage
...@@ -71,7 +74,11 @@ $ git status ...@@ -71,7 +74,11 @@ $ git status
```bash ```bash
$ git diff $ git diff
``` ```
exit with `q` exit with `q`.
<br>
![bulb](slides/img/bulb.png) If it is a long diff, you can display additional lines with space.
......
...@@ -28,7 +28,12 @@ $ git --version ...@@ -28,7 +28,12 @@ $ git --version
List the contents of a directory List the contents of a directory
```bash ```bash
$ ls #-lash $ ls
```
You can list more details with:
```bash
$ ls -lah
``` ```
Create a directory Create a directory
...@@ -36,6 +41,8 @@ Create a directory ...@@ -36,6 +41,8 @@ Create a directory
$ mkdir myNewDirectory $ mkdir myNewDirectory
``` ```
Change the directory to a specific folder Change the directory to a specific folder
```bash ```bash
$ cd myNewDirectory $ cd myNewDirectory
...@@ -50,8 +57,6 @@ $ cd ../.. ...@@ -50,8 +57,6 @@ $ cd ../..
# 2 levels up # 2 levels up
``` ```
Move a file or a directory Move a file or a directory
```bash ```bash
$ mv myFile.m myNewDirectory/. $ mv myFile.m myNewDirectory/.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment