Commit 1fdc247
authored
[RHAIENG-1567] : Add Mergify configuration for auto-merge and conflict handling (#34)
* Add Mergify configuration for auto-merge and conflict handling
- Implemented rules for auto-merging pull requests when all conditions are met, including reviewer approvals and CI checks.
- Added actions for handling merge conflicts, including labeling and commenting to notify authors.
- Configured commit message template for merged pull requests.
This setup aims to streamline the review process and improve collaboration efficiency.
* Update Mergify configuration to enforce no failing checks for auto-merge
* Refactor Mergify configuration to remove 'needs-rebase' label actions
* Update Mergify configuration to simplify conflict handling by removing 'needs-rebase' label action
* use approved_reviews_by instead of aproved_reviews
* Fix formatting in Mergify configuration
* Update Mergify configuration
* Update Mergify configuration to correct author reference in merge conflict notification
* Update Mergify configuration to clarify the purpose of the .mergify.yml file1 parent c3de9b8 commit 1fdc247
1 file changed
Lines changed: 55 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
0 commit comments