From 4ba360deeb30b04f5d2167bf7d7bf8a5cba66281 Mon Sep 17 00:00:00 2001
From: Florian Porrmann <fporrmann@techfak.uni-bielefeld.de>
Date: Mon, 3 Aug 2026 17:48:05 +0200
Subject: [PATCH] GitLab Synchronization: Fixed more merging related problems

---
 services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs | 2 +-
 services/web/modules/gitlab-sync/app/src/GitMerge.mjs        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs b/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs
index fb6bd61035..81024ffef5 100644
--- a/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs
+++ b/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs
@@ -468,7 +468,7 @@ async function getBlobContent(token, repoFullName, sha) {
   return await fetchGitLabJson(url, {
     headers: buildHeaders(token),
     signal: AbortSignal.timeout(REQUEST_LONG_TIMEOUT_MS)
-  }, 'getBlobContent').then(r => Buffer.from(r.content, 'base64'))
+  }, 'getBlobContent').then(r => r.content || '')
 }
 
 async function listNewCommitsWithStatus(token, fullName, branchName, fromCommit) {
diff --git a/services/web/modules/gitlab-sync/app/src/GitMerge.mjs b/services/web/modules/gitlab-sync/app/src/GitMerge.mjs
index 7b9d7c8dfa..5ec205bd82 100644
--- a/services/web/modules/gitlab-sync/app/src/GitMerge.mjs
+++ b/services/web/modules/gitlab-sync/app/src/GitMerge.mjs
@@ -278,8 +278,7 @@ async function resolveConflictSyncState(
     token,
     repoFullName,
     defaultBranchName,
-    newOlBranchHead,
-    tempBranchName,
+    tempBranchName
   )
 
   if (conflict) {