Skip to content

Commit

Permalink
Merge pull request #219 from Spomky-Labs/mergify/Spomky/config-update
Browse files Browse the repository at this point in the history
ci(Mergify): configuration update
  • Loading branch information
Spomky authored Jun 17, 2024
2 parents fc4934f + 5714bdd commit 2912947
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.mergify.yml export-ignore
/castor.php export-ignore
/CODE_OF_CONDUCT.md export-ignore
/ecs.php export-ignore
Expand Down
16 changes: 16 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
pull_request_rules:
- name: Automatic merge
description: Merge when PR passes all branch protection and has label automerge
conditions:
- label = automerge
actions:
merge:
- name: Label conflicting pull requests
description: Add a label to a pull request with conflict to spot it easily
conditions:
- conflict
- '-closed'
actions:
label:
toggle:
- conflict

0 comments on commit 2912947

Please sign in to comment.