diff options
author | Jan Macku <jamacku@redhat.com> | 2021-11-02 14:12:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-02 14:12:46 +0100 |
commit | ed6aa10fc7b4850d091d215ed791fc960f498d1f (patch) | |
tree | 29c71067c796685e1b30ffd304ea12e5203c70ca | |
parent | 8cf11f7660e207887c8f89af176dea900fd8b522 (diff) | |
download | initscripts-ed6aa10fc7b4850d091d215ed791fc960f498d1f.tar initscripts-ed6aa10fc7b4850d091d215ed791fc960f498d1f.tar.gz initscripts-ed6aa10fc7b4850d091d215ed791fc960f498d1f.tar.bz2 initscripts-ed6aa10fc7b4850d091d215ed791fc960f498d1f.tar.xz initscripts-ed6aa10fc7b4850d091d215ed791fc960f498d1f.zip |
ci: set default merge method to rebase
-rw-r--r-- | .mergify.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.mergify.yml b/.mergify.yml index 76eff393..be55be09 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -11,4 +11,5 @@ pull_request_rules: - base=master actions: merge: - method: merge + method: rebase + rebase_fallback: none |