mirror of https://github.com/m-labs/artiq.git
8 lines
155 B
YAML
8 lines
155 B
YAML
|
version: "1"
|
||
|
|
rules:
|
||
|
|
- base: master
|
||
|
|
upstream: m-labs:master
|
||
|
|
mergeMethod: merge
|
||
|
|
label: ":arrow_heading_down: pull"
|
||
|
|
conflictLabel: "merge-conflict"
|