Skip to content

Commit

Permalink
chore: allow mergify to merge to release when using no-squash (aws#6447)
Browse files Browse the repository at this point in the history
* added additional stack to 'ls' test so it doesn't fail

* allow merging to release with no-squash
  • Loading branch information
iliapolo authored Feb 25, 2020
1 parent e26cf31 commit 40c4167
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ pull_request_rules:
strict_method: merge
delete_head_branch: {}
conditions:
- base!=release
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge)
# Only if no-squash is set
Expand Down

0 comments on commit 40c4167

Please sign in to comment.