From 91e74944f3cc0a9f0dfb2cd8a1fc2c2d5bd9ea0a Mon Sep 17 00:00:00 2001 From: attero Date: Fri, 9 Apr 2021 13:07:40 +0200 Subject: [PATCH] added pull.yml to automatically update forks --- .github/pull.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000..f2f0cd3cb --- /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