... | ... | @@ -146,10 +146,12 @@ Repeat steps dev1, dev3, dev4 as needed depending on how long a time-period your |
|
|
* Source branch: `<your-user-name>/arc <your-dev-branch>`
|
|
|
* Target branch: `nordugrid/arc <target-branch>` (See [table of rules](/contributing/cheat-sheet#rule-table) for choosing correct target)
|
|
|
* Once the MR is created, select the *MergeRequest* template from the Description box drop-down menu and follow instructions in the template.
|
|
|
* If the changes are also for another branch (typically `next`) tell arcbot to automatically create a MR.
|
|
|
* Add the label `cherrypick:<other-branch>` (See [table of rules](/contributing/cheat-sheet#rule-table) for choosing correct label)
|
|
|
* Add labels [see more about labels])/contributing/overview#labeling-issues-and-merge-requests]
|
|
|
* If the changes are also for another branch (typically `next`) tell arcbot to automatically create a MR.
|
|
|
* Add the label `cherrypick:<other-branch>` (See [table of rules](/contributing/cheat-sheet#rule-table) for choosing correct label)
|
|
|
* Find more details about how the [nordugrid-arc-bot here](/contributing/about-arcbot).
|
|
|
* Add the appropriate `component` and `type` labels.
|
|
|
|
|
|
Find more details for [nordugrid-arc-bot here](/contributing/arcbot)
|
|
|
|
|
|
##### Draft MR
|
|
|
If you have already created a MR, but you are not done yet, communicate that you are working on development by creating a "Draft Merge request". See [step D6](/contributing/cheat-sheet#d7-create-merge-request) on how to create a merge request.
|
... | ... | @@ -170,7 +172,7 @@ git push origin --delete <my-dev-branch> |
|
|
|
|
|
|
|
|
## Rule table
|
|
|
Rules for parent branch, target branch, merge request branch labelling.
|
|
|
Rules for parent branch, target branch, merge request branch labeling.
|
|
|
|
|
|
Current release series refers to any release on current major release series. Which at time of writing would be 6.X.Y<br>
|
|
|
Next release series refers to any release on next major release series. Which at time of writing would be 7.X.Y. The "next" branch is created only once it is needed, so ignore all merge-rules to the next branch if the branch does not exist.
|
... | ... | |