... | @@ -39,7 +39,7 @@ Create a new branch for your CR by clicking the [New branch](https://forge.etsi. |
... | @@ -39,7 +39,7 @@ Create a new branch for your CR by clicking the [New branch](https://forge.etsi. |
|
The [New branch](https://forge.etsi.org/rep/li/schemas-definitions/-/branches/new) page allows you to specify details for your new branch. Fill in the fields as follows:
|
|
The [New branch](https://forge.etsi.org/rep/li/schemas-definitions/-/branches/new) page allows you to specify details for your new branch. Fill in the fields as follows:
|
|
| Field | Value |
|
|
| Field | Value |
|
|
|-------|-------|
|
|
|-------|-------|
|
|
| Branch name | Follow the [branching convention](Conventions/Branching-convention) and choose a name of the form `cr/{deliverable/{CR number}` |
|
|
| Branch name | Follow the [branching convention](Conventions/Branching-convention) and choose a name of the form `cr/{deliverable/{CR number} `Case is important, and so are the rendering conventions - so cr/103221-1/0123 is correct, but CR/TS1032211/cr0123 is not! |
|
|
| Create from | Pick the branch for the **plenary** meeting that will eventually approve the CR (e.g. `meeting/LI61`) |
|
|
| Create from | Pick the branch for the **plenary** meeting that will eventually approve the CR (e.g. `meeting/LI61`) |
|
|
|
|
|
|
> If you mess up, don't panic. You can't rename branches, but you can delete the branch you just created and try again. If you have changes you don't want to lose, you can use a [command line trick](Rename-a-Branch) or contact a [Maintainer](Process/Maintainers) for help.
|
|
> If you mess up, don't panic. You can't rename branches, but you can delete the branch you just created and try again. If you have changes you don't want to lose, you can use a [command line trick](Rename-a-Branch) or contact a [Maintainer](Process/Maintainers) for help.
|
... | @@ -131,7 +131,7 @@ The commit hash turns up in lots of places. If you have just made a Merge Reques |
... | @@ -131,7 +131,7 @@ The commit hash turns up in lots of places. If you have just made a Merge Reques |
|
|
|
|
|
![Commit hash](../img/commithash.png)
|
|
![Commit hash](../img/commithash.png)
|
|
|
|
|
|
Copy this hash and refer to it, and the Merge Request, in the "Comments" section of your CR.
|
|
Copy this hash and refer to it, and the Merge Request, in the "Comments" section of your CR.
|
|
|
|
|
|
For consistency, CR authors should adopt the following convention when writing the text to go in the "Comments" field:
|
|
For consistency, CR authors should adopt the following convention when writing the text to go in the "Comments" field:
|
|
|
|
|
... | | ... | |