| ... | @@ -8,6 +8,7 @@ title: Developer guide |
... | @@ -8,6 +8,7 @@ title: Developer guide |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# IMPORTANT
|
|
# IMPORTANT
|
|
|
|
|
|
|
|
If you have a local clone of the repository that **predates Feb. 19th, 2025, you must absolutely make a new clone**.
|
|
If you have a local clone of the repository that **predates Feb. 19th, 2025, you must absolutely make a new clone**.
|
| ... | @@ -316,6 +317,37 @@ Alternatively, run `git pull` to fetch and merge the remote changes into your lo |
... | @@ -316,6 +317,37 @@ Alternatively, run `git pull` to fetch and merge the remote changes into your lo |
|
|
|
|
|
|
|
Read more here: [Getting changes from a remote repository](https://docs.github.com/en/get-started/using-git/getting-changes-from-a-remote-repository)
|
|
Read more here: [Getting changes from a remote repository](https://docs.github.com/en/get-started/using-git/getting-changes-from-a-remote-repository)
|
|
|
|
|
|
|
|
|
### Example : pull from develop
|
|
|
|
|
|
|
|
Say you want to update your local develop branch. Updating it can be achieved in the following manner.
|
|
|
|
|
|
|
|
Switch to your local develop branch:
|
|
|
|
```bash
|
|
|
|
git checkout develop
|
|
|
|
```
|
|
|
|
|
|
|
|
Fetch the latest changes:
|
|
|
|
```bash
|
|
|
|
git fetch
|
|
|
|
```
|
|
|
|
which would return something like the following:
|
|
|
|
```bash
|
|
|
|
remote: Enumerating objects: 12, done.
|
|
|
|
remote: Counting objects: 100% (12/12), done.
|
|
|
|
remote: Compressing objects: 100% (12/12), done.
|
|
|
|
remote: Total 12 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
|
|
|
|
Unpacking objects: 100% (12/12), 17.55 Kio | 1.75 Mio/s, done.
|
|
|
|
From gitlab.uliege.be:deal-public/pase
|
|
|
|
9151686..f342ed7 develop -> public/develop
|
|
|
|
```
|
|
|
|
|
|
|
|
Then merge those changes into develop:
|
|
|
|
```bash
|
|
|
|
git merge
|
|
|
|
```
|
|
|
|
|
|
|
|
Alternatively, instead of running `git fetch` and then `git merge`, run `git pull` which does the same actions in one go.
|
|
|
|
|
|
|
# Semantic versioning
|
|
# Semantic versioning
|
|
|
The PASE repository follows the recommendations of [semantic versioning](https://docs.npmjs.com/about-semantic-versioning ).
|
|
The PASE repository follows the recommendations of [semantic versioning](https://docs.npmjs.com/about-semantic-versioning ).
|
|
|
A release of the software is identified with its version number vX.Y.Z following the table below.
|
|
A release of the software is identified with its version number vX.Y.Z following the table below.
|
| ... | |
... | |
| ... | | ... | |