... | ... | @@ -23,21 +23,21 @@ Go to the [Forge repository](https://forge.etsi.org/rep/li/trial). |
|
|
|
|
|
From there you need to go to the [Branches page](https://forge.etsi.org/rep/li/trial/-/branches). Select "Repository" from the menu on the left-hand side of the page, and select "[Branches](https://forge.etsi.org/rep/li/trial/-/branchess)".
|
|
|
|
|
|
![Go to the Branches page](../img/GoToBranches.gif)
|
|
|
![Go to the Branches page](../img/GoToBranches.png)
|
|
|
|
|
|
# Make a new CR branch
|
|
|
The first step is to create a [branch](Conventions/Branching-convention) for your CR. Think of it as the contents of your CR - it's your own special working copy of the repository where you make your changes.
|
|
|
|
|
|
Create a new branch for your CR by clicking the [New branch](https://forge.etsi.org/rep/li/trial/-/branches/new) button in the top right of the page.
|
|
|
|
|
|
![Make a new branch](../img/MakeANewBranch.gif)
|
|
|
![Make a new branch](../img/MakeANewBranch.png)
|
|
|
|
|
|
The [New branch](https://forge.etsi.org/rep/li/trial/-/branches/new) page allows you to specify details for your new branch. Fill in the fields as follows:
|
|
|
|
|
|
| Field | Value |
|
|
|
| -- | -- |
|
|
|
| Branch name | Follow the [branching convention](Conventions/Branching-convention) and choose a name of the form `cr/{deliverable/{CR number}` |
|
|
|
| Create from | Pick the branch for the **plenary** meeting that will eventually approve the CR (e.g. `meeting/SA94e`) |
|
|
|
| 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.
|
|
|
|
... | ... | @@ -48,7 +48,7 @@ Create a Merge Request by going to the [Branches page](https://forge.etsi.org/re |
|
|
|
|
|
Once you've found it, hit the "Merge Request" button.
|
|
|
|
|
|
![Find your branch and create a merge request from it](../img/CreateMR.gif)
|
|
|
![Find your branch and create a merge request from it](../img/CreateMR.png)
|
|
|
|
|
|
Fill in the Merge Request form following the [Merge Request conventions](Conventions/Merge-Request-convention):
|
|
|
|
... | ... | @@ -70,7 +70,7 @@ Once you're done, click the "Submit merge request" button |
|
|
> If you make a mistake here, don't worry - you can always come back and edit it later, or get one of the [Maintainers](Process/Maintainers) to help you.
|
|
|
|
|
|
|
|
|
![Fill out the Merge Request correctly](../img/FillOutMRForm.gif)
|
|
|
![Fill out the Merge Request correctly](../img/FillOutMRForm.png)
|
|
|
|
|
|
# Make your changes
|
|
|
You can now start making changes that you want to make.
|
... | ... | |