From 65453327537757fe87ff9cccd35d180da15f865d Mon Sep 17 00:00:00 2001
From: clemens33 <clemens.kr@gmail.com>
Date: Mon, 14 Oct 2024 10:17:08 +0200
Subject: [PATCH] fix to github actions workflow

---
 .github/workflows/upgrade.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/upgrade.yaml b/.github/workflows/upgrade.yaml
index 74f2a16..c0b63e4 100644
--- a/.github/workflows/upgrade.yaml
+++ b/.github/workflows/upgrade.yaml
@@ -79,7 +79,7 @@ jobs:
       run: |
         git fetch origin charts
         git checkout -b charts origin/charts
-        git merge ${GITHUB_REF#refs/heads/}
+        git merge ${GITHUB_REF#refs/heads/} --allow-unrelated-histories --no-edit
         helm package charts/mlflow
         helm package charts/mlflow-deployments-server
         helm repo index --url https://clemens33.github.io/mlflow .