Skip to content

Commit

Permalink
Use squash merge method for mergify
Browse files Browse the repository at this point in the history
Mergify is blocked with the error:

  Merge commits are not allowed on this repository.
  The repository configuration doesn't allow merge commits.
  The merge method configured in Mergify configuration must be
  allowed in the repository configuration settings.
  • Loading branch information
tobias-urdin committed Aug 9, 2024
1 parent 21cb95c commit a1cd479
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pull_request_rules:
- name: automatic merge
actions:
queue:
method: merge
method: squash
name: default
conditions:
- label!=work-in-progress
Expand Down

0 comments on commit a1cd479

Please sign in to comment.