Skip to content

Commit

Permalink
ci(Mergify): configuration update
Browse files Browse the repository at this point in the history
Signed-off-by: Harald Heckmann <[email protected]>
  • Loading branch information
sea212 committed Jan 22, 2024
1 parent 1918416 commit e5b4065
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ pull_request_rules:
remove:
- s:in-progress
- s:review-needed
merge:
method: squash
queue:
merge_method: squash
- name: ask to resolve conflict
conditions:
- conflict
Expand Down

0 comments on commit e5b4065

Please sign in to comment.