From 0ff5eea4edebf0cc2dff65c98bb38ae029c13394 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Fri, 19 Jul 2024 23:13:20 +0200
Subject: [PATCH] gerrit-one-way-sync: merge instead of rebase

---
 services/gerrit/one-way-sync.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/gerrit/one-way-sync.nix b/services/gerrit/one-way-sync.nix
index dfd0a4a..ac6edd8 100644
--- a/services/gerrit/one-way-sync.nix
+++ b/services/gerrit/one-way-sync.nix
@@ -31,8 +31,8 @@ let
       git pull origin ${fromRefspec}
       EXPECTED_REF=$(git rev-list ${localRefspec} | head -1)
       git fetch ${fromUri} ${fromRefspec}
-      git rebase FETCH_HEAD
-      GIT_SSH_COMMAND='ssh -i ${cfg.deployKeyPath}' git push ${cfg.pushUrl} HEAD:${targetRef} --force-with-lease=${targetRef}:$EXPECTED_REF --force-if-includes
+      git merge FETCH_HEAD
+      GIT_SSH_COMMAND='ssh -i ${cfg.deployKeyPath}' git push ${cfg.pushUrl} HEAD:${targetRef}
     '';
     serviceConfig = {
       User = "git";