Files
RSSHub/.github/pull.yml
Rongrong d7cd1a4b4e chore(pull): fix automatic merge (#9806)
Signed-off-by: Rongrong <i@rong.moe>
2022-05-23 04:28:25 +08:00

9 lines
401 B
YAML

version: '1'
rules:
- base: master
upstream: diygod:master
# default value if this file does not exist is `hardreset`, effectively overwriting any downstream changes!
# previously it was the misconfigured PR route test workflow that rescued downstream changes from being overwritten
mergeMethod: merge
mergeUnstable: true # prevent non-pass tests from preventing automatic merge