... | ... | @@ -123,18 +123,11 @@ Develop, add, commit, push to fork |
|
|
#### D5.
|
|
|
Repeat steps dev1, dev3, dev4 as needed depending on how long a time-period your development spans.
|
|
|
|
|
|
#### D6.
|
|
|
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 D7](/contributing/cheat-sheet#d7-create-merge-request) on how to create a merge request.
|
|
|
|
|
|
* Add `Draft:` to the beginning of your title.
|
|
|
* The merge request will just stay open and not be mergeable, as long as the "Draft" keyword is in the title. The merge request will act as a communication platform, and a display of what you are currently working on.
|
|
|
* Commits that are pushed to your fork will be continuously recorded to the merge request.
|
|
|
* Only once you remove the "Draft" keyword, the merge request can actually be treated.
|
|
|
|
|
|
#### D7. Create merge request to upstream nordugrid/arc using the web interface and arcbot
|
|
|
**Note! Once a merge request has been made, all following commits are recorded into the merge request.** You should therefore create a new branch to work on a different task with unrelated commits.
|
|
|
**Note! Once a merge request has been made, all following commits to the source branch are recorded into the merge request.** You should therefore create a new branch to work on a different task with unrelated commits.
|
|
|
|
|
|
|
|
|
|
|
|
* Make sure you have added the arcbot as member to your fork. See instructions in [point G2](/contributing/cheat-sheet#G2).
|
|
|
* Either:
|
|
|
- Use the link you get when you push the commits to the dev-branch on your fork to create a MR. **NB you must then manually press the "Change branches" link** as the suggested default target branch is in your fork. You want to use the upstream repo as the target.
|
... | ... | @@ -144,10 +137,18 @@ If you have already created a MR, but you are not done yet, communicate that you |
|
|
* Target branch: `nordugrid/arc <target-branch>` (See [table of rules](/contributing/cheat-sheet#rule-table) for choosing correct target, most often the `master` branch.)
|
|
|
* 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 `copy_mr:<other-branch>` (See [table of rules](/contributing/cheat-sheet#rule-table) for choosing correct label, most often the `next` branch.)
|
|
|
* Add the label `cherrypick:<other-branch>` (See [table of rules](/contributing/cheat-sheet#rule-table) for choosing correct label, most often the `next` branch.)
|
|
|
|
|
|
Find more details for [nordugrid-arc-bot here](/contributing/overview#1-using-the-web-interface-and-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.
|
|
|
|
|
|
* Add `Draft:` to the beginning of your title.
|
|
|
* The merge request will just stay open and not be mergeable, as long as the "Draft" keyword is in the title. The merge request will act as a communication platform, and a display of what you are currently working on.
|
|
|
* Commits that are pushed to your fork will be continuously recorded to the merge request.
|
|
|
* Only once you remove the "Draft" keyword, the merge request can actually be treated.
|
|
|
*
|
|
|
|
|
|
#### D8. Clean-up - optional
|
|
|
|
... | ... | |