mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-22 06:10:22 +00:00
ci: Add mergify rule for conflict
Added mergify rules to post a message when there is conflict on the PR. ref: https://doc.mergify.io/examples.html#request-for-action Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
parent
753f6b7fec
commit
d55dc6de92
@ -7,6 +7,15 @@ pull_request_rules:
|
|||||||
dismiss_reviews:
|
dismiss_reviews:
|
||||||
approved: true
|
approved: true
|
||||||
changes_requested: false
|
changes_requested: false
|
||||||
|
- name: ask to resolve conflict
|
||||||
|
conditions:
|
||||||
|
- conflict
|
||||||
|
actions:
|
||||||
|
comment:
|
||||||
|
# yamllint disable-line rule:truthy
|
||||||
|
message: "This pull request now has conflicts with the target branch.
|
||||||
|
Could you please resolve conflicts and force push the corrected
|
||||||
|
changes? 🙏"
|
||||||
- name: automatic merge
|
- name: automatic merge
|
||||||
conditions:
|
conditions:
|
||||||
- label!=DNM
|
- label!=DNM
|
||||||
|
Loading…
Reference in New Issue
Block a user