Skip to content

Additional update of CONTRIBUTING.md #276

@larsolofsson

Description

@larsolofsson

Should papiNet add the rule for merging into the master branch to CONTRIBUTING.md?
For example
"All commits must be made to a non-protected branch and submitted via a pull request before they can be merged into a the master branch. The pull request targeting the master branch requires 3 approvals and no changes requested before it can be merged."

Rule as specified in Github settings
Require a pull request before merging into branch master
When enabled, all commits must be made to a non-protected branch and submitted via a pull request before they can be merged into a branch that matches this rule

Require approvals
When enabled, pull requests targeting a matching branch require a number of approvals and no changes requested before they can be merged.
3 approvals required.

Which maintainers can make an approval?
Is there any difference between voting and approval?
I have only found a specification of which maintainers can vote but nothing about approving.


Proposed update of the following text
"When you merge the develop branch or a hotfix/<my-hotfix> branch into the main branch, you MUST ALWAYS check that there are only changes via the new MAJOR++.0.0/, MAJOR.MINOR++.0/, or MAJOR.MINOR.PATCH++/ folders, and that all other MAJOR.MINOR.PATCH/ folder remains unchanged."
To be changed to
"When you merge the develop branch or a hotfix/<my-hotfix> branch into the main branch, you MUST ALWAYS check that there are only changes via the new MAJOR++.0.0/, MAJOR.MINOR++.0/, or MAJOR.MINOR.PATCH++/ folders and changes of supporting files, and that all other existingMAJOR.MINOR.PATCH/ folders remains unchanged."

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions