blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set ignore_conflicts, the new mergify behaviour is worse

This commit is contained in:
Michael Vines 2020-03-05 08:44:20 -07:00
parent fd00e5cb35
commit fb2620b3a5
No known key found for this signature in database
GPG Key ID: 33F4FDEC4E0E88BD
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.mergify.yml
View File

@ -25,6 +25,7 @@ pull_request_rules:
- label=v1.0 - label=v1.0
actions: actions:
backport: backport:
ignore_conflicts: true
branches: branches:
- v1.0 - v1.0
- name: v1.1 backport - name: v1.1 backport
@ -33,6 +34,7 @@ pull_request_rules:
- label=v1.1 - label=v1.1
actions: actions:
backport: backport:
ignore_conflicts: true
branches: branches:
- v1.1 - v1.1
- name: v1.2 backport - name: v1.2 backport
@ -41,5 +43,6 @@ pull_request_rules:
- label=v1.2 - label=v1.2
actions: actions:
backport: backport:
ignore_conflicts: true
branches: branches:
- v1.2 - v1.2