Skip to content

Commit

Permalink
Revert "Update .mergify.yml"
Browse files Browse the repository at this point in the history
This reverts commit 7ead24b.
  • Loading branch information
v1v committed Apr 7, 2021
1 parent 64d2b6f commit 856329f
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
pull_request_rules:
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: |
This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
```
git fetch upstream
git checkout -b {{head}} upstream/{{head}}
git merge upstream/{{base}}
git push upstream {{head}}
```
- name: Automatic squash and merge on approval with success checks and ready-to-merge label
conditions:
- "#approved-reviews-by>=2"
Expand Down

0 comments on commit 856329f

Please sign in to comment.