mirror of https://github.com/m-labs/artiq.git
add pull.yml (#1918)
This commit is contained in:
parent
32db6ff978
commit
d8597e9dc8
|
@ -0,0 +1,7 @@
|
||||||
|
version: "1"
|
||||||
|
rules:
|
||||||
|
- base: master
|
||||||
|
upstream: m-labs:master
|
||||||
|
mergeMethod: merge
|
||||||
|
label: ":arrow_heading_down: pull"
|
||||||
|
conflictLabel: "merge-conflict"
|
Loading…
Reference in New Issue