Skip to content

Commit

Permalink
Merge pull request #2228 from twilio-labs/fix/kodiak
Browse files Browse the repository at this point in the history
fix: kodiac config to only use a single merge mothod
  • Loading branch information
SiTaggart authored Feb 25, 2022
1 parent 1f564a9 commit 0e72e84
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .kodiak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version = 1
[merge]
automerge_label = "🚀 merge it!"
blocking_labels = ["Status: WIP", "Status: Do Not Merge"]
method = ["rebase", "squash"]
method = "squash"

[merge.automerge_dependencies]
# only auto merge "minor" and "patch" version upgrades.
Expand Down

0 comments on commit 0e72e84

Please sign in to comment.