|
|
|
|
|
[[_TOC_]]
|
|
|
|
|
|
# How to develop `MEDUSA`, Making best use of `git`
|
... | ... | @@ -8,13 +7,15 @@ in the following `how-to` page, you'll be shown how to create your own branches |
|
|
|
|
|
Imagine you have a bugfix or a whole new component to add in MEDUSA.
|
|
|
|
|
|
## First on the MEDUSA gitlab : create a new issue :
|
|
|
## Starting a new dev project on the MEDUSA gitlab
|
|
|
|
|
|
### first: create a new issue
|
|
|
|
|
|
![image](uploads/c6da67b12943520f5affa6c9a9149a7b/image.png)
|
|
|
(i know you're not necessarily facing an issue, but that's how git calls it...)
|
|
|
The issue creates a page that will be linked to your development, where you can describe what you plan to do, why, the different steps to do it,...
|
|
|
|
|
|
## Create a merge request (based on the main branch).
|
|
|
### Create a merge request (based on the main branch).
|
|
|
|
|
|
Creating merge request will also create your development branch associated to this merge request.
|
|
|
If we take my biopole work for example :
|
... | ... | @@ -22,15 +23,17 @@ If we take my biopole work for example : |
|
|
You can see your merge request:
|
|
|
![image](uploads/6a8ecfb4c4b229c1fe01498c954c6dfa/image.png)
|
|
|
|
|
|
## Split the work in steps
|
|
|
## Split the work in steps : create your new dev-branch on your main-project branch (rather than the trunk)
|
|
|
|
|
|
To make the coding easier, and for you to have a better idea of what you've done,
|
|
|
you might want to split your work in 3 or 4 stages.
|
|
|
For example, for my diapause work,
|
|
|
For example, for my diapause work :
|
|
|
* 1- stage was in 1D to move the mesozoo at depth and back up depending of the time of year, and change the metabolism once at depth.
|
|
|
* 2- Let the mesozoo bring some Carbon at depth with them (as if they had made some stocks of fat for the winter)
|
|
|
* 3- move to 3D, adapt the diapause and wake up timings to the 3D...
|
|
|
For this, you might want to do a separated branch for each stage, based on the merged request branch, that you'll merge back to it once the work is done.
|
|
|
|
|
|
For this, you might want to do a separated branch for each stage, based on the merged request branch (your "main" project branch), that you'll merge back to once the work is done.
|
|
|
In my case, i'll base my next development branch (biopole-diapause-C-stock) on the my "main" Diapause branch (biopole-diapause-work) :
|
|
|
|
|
|
This is done this way :
|
|
|
|
... | ... | |