From 481105834b79101b65c99d1080baa7d566601053 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Thu, 11 Mar 2021 16:53:15 -0500
Subject: [PATCH] Switch from merge-resolve(default) to merge mode for
 containerd-build-arm64

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
---
 .zuul.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index b45797d36..dd47ffe76 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,6 @@
 - project:
     name: containerd/containerd
+    merge-mode: merge
     check:
       jobs:
         - containerd-build-arm64