From a2a3d2586c8435e6e46bf7cb7750303188dab5f0 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sat, 22 Mar 2025 08:44:58 +0100
Subject: [PATCH] workflow: fix merge conflict failing script

---
 .gitea/workflows/update-flake.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml
index 06f4c6e..096c3c6 100644
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@@ -34,7 +34,7 @@ jobs:
             if [ $commits_ahead -ne 0 ]
             then
               git fetch origin
-              git merge --squash origin/main
+              git merge --squash origin/main || true # do not exit script on merge conflict
               git push --force-with-lease
 
               # solve potential merge conflict by taking flake.lock from main