From f8805f17c2804957f22c368c1a185eb0990fdc38 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <alex@ydb.tech>
Date: Thu, 5 Dec 2024 15:11:17 +0100
Subject: [PATCH] Conflicts on CMakeLists

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

diff --git a/.github/workflows/sync_cmakebuild.yml b/.github/workflows/sync_cmakebuild.yml
index 9aec0b0e3e7a..7d19390a0ae4 100644
--- a/.github/workflows/sync_cmakebuild.yml
+++ b/.github/workflows/sync_cmakebuild.yml
@@ -37,7 +37,7 @@ jobs:
         
         conflicts_file=$(mktemp)
         git merge main --no-commit --no-ff main | true > $conflicts_file
-        git reset HEAD --hard
+        git merge --abort
         if [ -s $conflicts_file ];then
           echo Conflicts detected, trying to remove referenced CMakeLists* files
           grep -E -o '\s\S*CMakeLists\S*\s' $conflicts_file | xargs rm