@@ -12,14 +12,14 @@ The contributor reserves a contribution number on the ETSI Portal, so that it ca
The contributor creates a new branch for the contribution. See [Gitlab's branching documentation for more details](https://docs.gitlab.com/ee/user/project/repository/branches/).
#### 3. Contributor commits changes to the branch
#### 3. Contributor make available changes to the branch
The contributor makes a set of changes (either modifications or additions) to the Forge platform using the newly-created branch.
This activity can be executed in several ways:
This activity may be executed in several ways:
* Via the web interface of Gitlab (either the "Edit" button or the "Web IDE")
* Via Git (by using a Git client locally)
* Via a Git client
#### 4. Contributor creates and submits a merge request
@@ -30,20 +30,22 @@ The submitted Merge Request shall include:
* Motivation, rationale or purpose of the changes, and the description of changes
It may also include:
* The contribution number reserved at step 1 (if any)
* A link to a Bugzilla issue or Gitlab issue (if any)
* The contribution number reserved at step 1 (if any),
* A link to a Bugzilla issue or Gitlab issue (if any).
#### 5. Contributor prepares and makes available a contribution on the Portal.
The submitted contribution shall include:
* A link to the Merge Request
* The list of commits
* Reference in the text to the location of the changed software i.e. the changes in the target deliverable which include the links to the new version of the software in the named branch linked to the MR. For example;
> Merge request XYZ proposes to merge branch FEAT1 into branch v1.1.x and is to be approved in contribution (19)00000ABC. The contribution will contain the changes in the base deliverable with the URLs updated to point to forge.etsi.org/rep/TB/DOCNUM/tree/FEAT1
The submitted contribution may include
* The tag to be applied after the MR is merged
* The tag to be applied after the MR is merged,
* The exporte `diff` file for the changes in the code,
* Changes to other elements of the deliverable (e.g. textual descriptions, tables, figures, etc.) required to maintain consistency with the changes proposed in the Merge Request.
#### 5. Contribution approval process is held leading to the approval of the contribution on the Portal;
@@ -71,3 +73,4 @@ Other elements in the approved contributions are incorporated following the usua