diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 598eb53ef40da2581615e97e00ee379427cf7135..5d926a0a10c4cbd86da24ed82f01da4523a518c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,13 +31,13 @@ The sim@openpass source code can be found [here](https://gitlab.eclipse.org/ecli To build the project, follow the guide in "pathToRepo\sim\doc\OSI World Setup Guide.pdf". -The branch 'servant' contains the contributions that will be included in the next release. The 'main' branch contains the latest stable release. +The branch 'develop' contains the contributions that will be included in the next release. The 'main' branch contains the latest stable release. ### Committer contribution process 1. (you) Discuss your planned contribution with the project lead first. 2. (you) If needed, create the Issue on GitLab and assign it to yourself. -3. (you) In GitLab, create a merge request. The related branch will be created from the branch 'servant'. +3. (you) In GitLab, create a merge request. The related branch will be created from the branch 'develop'. 4. (you) Work on it and respect the following points: - Stick to the [coding guideline](https://wiki.eclipse.org/images/3/3f/OpenPASS_Conventions.pdf) - Amend the documentation if necessary @@ -45,5 +45,5 @@ The branch 'servant' contains the contributions that will be included in the nex - Make sure, the code base with your contribution compiles 5. (you) Assign the issue to another committer. 6. (other committer) Review the code. -7. (other committer) To merge new branch into 'servant' you can close the merge request via GitLab. +7. (other committer) To merge new branch into 'develop' you can close the merge request via GitLab. 8. (you) Present your contribution to the openPASS WG