ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: update backport section 

Only maintainers can set labels on PRs, so let's clarify that point in
the doc which says something confusing at the moment.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/4344/head
Guillaume Abrioux 2019-08-14 14:32:51 +02:00
parent 5e33d224d3
commit c49b8d04c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.md
View File

@ -41,9 +41,9 @@ This will prevent the engine merging your pull request.
### Backports (maintainers only) ### Backports (maintainers only)
If you wish to see your work from 'master' being backported to a stable branch you can apply a label on the PR that points to the desired stable branch. If you wish to see your work from 'master' being backported to a stable branch you can ping a maintainer
Labels for backports are name: `backport-stable-<branch version>`, eg: `backport-stable-3.2`. so he will set the backport label on your PR. Once the PR from master is merged, a backport PR will be created by mergify,
Once the PR from master is merged, a backport PR will be created by mergify, if there is a cherry-pick conflict you must resolv it by pulling the branch. if there is a cherry-pick conflict you must resolv it by pulling the branch.
**NEVER** push directly into a stable branch, **unless** the code from master has diverged so much that the files don't exist in the stable branch. **NEVER** push directly into a stable branch, **unless** the code from master has diverged so much that the files don't exist in the stable branch.
If that happens, inform the maintainers of the reasons why you pushed directly into a stable branch, if the reason is invalid, maintainers will immediatly close your pull request. If that happens, inform the maintainers of the reasons why you pushed directly into a stable branch, if the reason is invalid, maintainers will immediatly close your pull request.