Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions docs/PULL_REQUESTS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Pull requests

To add code to the different repositories the code is build in a feature branch and merged back to the branch ``develop``
To add code to the different repositories the code is build in a feature branch and merged back to the ``develop`` or `` main`` branch.
using a pull request. No direct committing is allowed to the branches ``develop`` and ``main``.
When a release is created the branch ``develop`` is merged to the branch ``main`` using a pull request.
In some repositories the branch ``develop`` is skipped and not there. Feature branches are merged directly to the branch
Expand All @@ -27,4 +27,9 @@ The following labels cause the pull request to be ignored in the release notes:
- ``duplicate``
- ``invalid``

**Remark**: The label ``tooling`` is not a standard label, so that may need to be created by the first developer using it.
**Remark**: The label ``tooling`` is not a standard label, so that may need to be created by the first developer using it.

## Code review

If you are a long time and trusted contributor, your can review your pull-requests with your collegues.
Otherwise request the code owner of the repository to review your pull request. If you haven't heard back in 3 days, report your pull request in the [CoMPAS slack channel](https://lfenergy.slack.com/)