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:
Jonathan White
2022-03-20 22:12:29 -04:00
parent 9e21df2515
commit 1e73d549ed
6 changed files with 24 additions and 52 deletions

4
.github/pull.yml vendored
View File

@@ -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