From 311116f4fbd88e7425d4eb523459168dca550c08 Mon Sep 17 00:00:00 2001
From: Kewbit <kewbitxmr@protonmail.com>
Date: Wed, 27 Nov 2024 22:50:15 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3701191..43f874f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,6 @@ update_patched_master:
     - patched_changes
   script:
     - apk add --no-cache git
-    - echo "Setting up Git..."
     - git config user.name "$GITLAB_USER_NAME"
     - git config user.email "$GITLAB_USER_EMAIL"
     - git remote set-url origin http://oauth2:${GITLAB_ACCESS_TOKEN}@172.17.0.1:4411/${CI_PROJECT_PATH}.git
@@ -19,16 +18,11 @@ update_patched_master:
     - git fetch --all
     - echo "Checking out patched_master..."
     - git checkout patched_master
-    - echo "Merging master into patched_master..."
-    - git merge origin/master --no-edit
-    - echo "Cleaning working directory..."
-    - git rm -r --cached .
-    - git clean -fd
-    - echo "Overwriting all files from patched_changes (excluding .gitlab-ci.yml)..."
-    - git checkout origin/patched_changes -- . ':!.gitlab-ci.yml'
-    - echo "Adding changes..."
+    - echo "Merging master into patched_master, favoring patched_changes..."
+    - git merge -s recursive -X theirs origin/master
+    - echo "Cleaning up after merge..."
     - git add .
-    - echo "Committing changes..."
-    - git commit -m "Auto-update patched_master with changes from patched_changes"
+    - echo "Committing resolved merge..."
+    - git commit -m "Auto-resolve merge conflicts: Favor patched_changes"
     - echo "Pushing changes to patched_master..."
     - git push origin patched_master