@@ -150,17 +150,18 @@ Assign the issue to the appropriate Iteration cadence (if there is one).
...
@@ -150,17 +150,18 @@ Assign the issue to the appropriate Iteration cadence (if there is one).
## Creating the Branch and Merge request
## Creating the Branch and Merge request
The creation of a branch marks the beginning of a new feature's development, and the [Merge request](#merge-requests) will be used at the end of the feature's development to include it in the code base.
The creation of a branch marks the beginning of a new feature's development, and the [Merge request](#merge-requests) will be used at the end of the feature's development to include it in the code base.
The Gitlab Issue interface allows members to create both the associated Branch and Merge request at the same time.
Branches should **always be created from Issues** within the Gitlab interface, and the Gitlab repository settings are such that their suggested name will always match the branch name push rule.
Branches should **always be created from Issues** within the Gitlab interface, as the Gitlab repository settings ensure that their suggested name will always match the branch name push rule.
To configure the new branch, click on the drop-down arrow on the right of the blue "Create merge request" button.
To create the new branch and merge request, click on the drop-down arrow on the right of the "Create merge request" button.
When creating a branch, always check that you are branching from the correct source branch (see [Branching strategy : git-flow](#branching-strategy--git-flow) ; the default branch is `develop`).
When creating a branch, always check that you are branching from the correct source branch (see [Branching strategy : git-flow](#branching-strategy--git-flow) ; the default branch is `develop`).
When the correct source is selected, click on "Create merge request", at the bottom of the drop-down.
When the correct source is selected, click on "Create merge request", at the bottom of the dialog window (see screenshot below).
Never directly click on "Create merge request", **always use the button at the bottom of the drop-down**.
Avoid directly clicking on "Create merge request", **always use the button at the bottom of the drop-down** to make sure you are branching from the correct source branch.
