From ab7f5ab3b6e63a1ff53ff7929da4fbf3d4d2af36 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Wed, 29 Mar 2023 11:01:05 +0530 Subject: [PATCH] fix rebase issue fix rebase issue --- devops/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/Dockerfile b/devops/Dockerfile index f951449559..9121835a26 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex \ && git pull \ && cd /wbia/wildbook-ia/ \ && git reset --hard origin/main \ + && git config pull.rebase true \ && git pull ##########################################################################################