mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 18:00:36 +00:00
da57b51fb6
This commit introduces Mergify, a powerful bot designed to assist with automated merging and other CI-related tasks. As an initial step, we enable a basic feature: automatically notifying users when a pull request has merge conflicts. When a conflict is detected, Mergify will add a label to the PR. This label will be removed once the conflict is resolved. This is foundation PR to activate the bot and start using it for backports too. In the future, we plan to expand Mergify’s role to include auto-merging, as discussed in #1667, once the project is ready. Signed-off-by: Sébastien Han <seb@redhat.com>
23 lines
629 B
YAML
23 lines
629 B
YAML
pull_request_rules:
|
|
- name: ping author on conflicts and add 'needs-rebase' label
|
|
conditions:
|
|
- conflict
|
|
- -closed
|
|
actions:
|
|
label:
|
|
add:
|
|
- needs-rebase
|
|
comment:
|
|
message: >
|
|
This pull request has merge conflicts that must be resolved before it
|
|
can be merged. @{{author}} please rebase it.
|
|
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
|
|
|
|
- name: remove 'needs-rebase' label when conflict is resolved
|
|
conditions:
|
|
- -conflict
|
|
- -closed
|
|
actions:
|
|
label:
|
|
remove:
|
|
- needs-rebase
|