diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 0000000000..f2f0cd3cbf --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,12 @@ +# doc: https://github.com/wei/pull#basic-setup +# manual trigger: https://pull.git.ci/process/${fork-user}/keepassxc +# pull from: https://github.com/keepassxreboot/keepassxc +version: "1" +rules: + - base: master + upstream: keepassxreboot:master + mergeMethod: hardreset + + - base: develop + upstream: keepassxreboot:develop + mergeMethod: rebase