Switch from merge-resolve(default) to merge mode for containerd-build-arm64

dims · dims · commit 481105834b79 · 2021-03-11T16:53:15.000-05:00
Signed-off-by: Davanum Srinivas &lt;davanum@gmail.com&gt;
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -1,5 +1,6 @@
 - project:
     name: containerd/containerd
+    merge-mode: merge
     check:
       jobs:
         - containerd-build-arm64
