| ... | ... | @@ -6,6 +6,7 @@ title: Developer guide |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# IMPORTANT
|
|
|
|
|
|
|
|
If you have a local clone of the repository that **predates Feb. 19th, 2025, you must absolutely make a new clone**.
|
| ... | ... | @@ -181,14 +182,21 @@ Valid branch names: |
|
|
|
- release-v\<major version\>.\<minor version\>.\<patch version\> (e.g. release-v1.2.4)
|
|
|
|
|
|
|
|
Once the branch and merge request are created, you can pull the branch locally, e.g. :
|
|
|
|
```
|
|
|
|
```bash
|
|
|
|
git fetch
|
|
|
|
git checkout -t <remote>/<branch name>
|
|
|
|
git checkout <branch name>
|
|
|
|
```
|
|
|
|
|
|
|
|
If you are unsure about the `<remote>/<branch name>` combination, you can find it with git:
|
|
|
|
For example, if you branch is named `10-my-feature-branch`, run :
|
|
|
|
```bash
|
|
|
|
git fetch
|
|
|
|
git checkout 10-my-feature-branch
|
|
|
|
```
|
|
|
|
git branch -a
|
|
|
|
|
|
|
|
You should see the following terminal output :
|
|
|
|
```bash
|
|
|
|
branch '10-my-feature-branch' is set up to track 'public/10-my-feature-branch'.
|
|
|
|
Switched to a new branch '10-my-feature-branch'
|
|
|
|
```
|
|
|
|
|
|
|
|
Before starting development, make sure to read the next sections.
|
| ... | ... | @@ -301,7 +309,9 @@ You can : |
|
|
|
|
|
|
|
## After a merge: `git fetch` or `git pull`
|
|
|
|
|
|
|
|
After a merge (either on develop, main, or any other branch) occurs on Gitlab, run `git fetch` to update your local repository with the changes from remote, without merging them. Run `git pull` to merge the remote changes into your local repository.
|
|
|
|
After a merge (either on develop, main, or any other branch) occurs on Gitlab, run `git fetch` to update your local repository with the changes from remote, without merging them. Once you have fetched the changes from the remote repo, run `git merge` to merge the remote branch into your local branch (e.g. update your local develop branch with the latest changes from the Gitlab repo).
|
|
|
|
|
|
|
|
Alternatively, run `git pull` to fetch and merge the remote changes into your local repository in one go.
|
|
|
|
|
|
|
|
Read more here: [Getting changes from a remote repository](https://docs.github.com/en/get-started/using-git/getting-changes-from-a-remote-repository)
|
|
|
|
|
| ... | ... | |
| ... | ... | |