8 lines
320 B
YAML
8 lines
320 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
|