forked from keepassxreboot/keepassxc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added pull.yml to automatically update forks
- Loading branch information
1 parent
c0ae130
commit 91e7494
Showing
1 changed file
with
12 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |