mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-12-04 15:39:34 +01:00
Update release tool with new merge strategy
* Fast-forward `latest` tag to merged tag * Don't merge into TARGET_BRANCH * Fix missing argon2 in snapcraft.yml
This commit is contained in:
4
.github/pull.yml
vendored
4
.github/pull.yml
vendored
@@ -3,10 +3,6 @@
|
||||
# pull from: https://github.com/keepassxreboot/keepassxc
|
||||
version: "1"
|
||||
rules:
|
||||
- base: master
|
||||
upstream: keepassxreboot:master
|
||||
mergeMethod: hardreset
|
||||
|
||||
- base: develop
|
||||
upstream: keepassxreboot:develop
|
||||
mergeMethod: rebase
|
||||
|
||||
Reference in New Issue
Block a user