From 39e84e8a0939fcf3bed960d57e41edc168c4b8c5 Mon Sep 17 00:00:00 2001
From: Jan Sigrist <158459324+jansigi@users.noreply.github.com>
Date: Thu, 20 Jun 2024 09:49:11 +0200
Subject: [PATCH] DOPE-222: added rebase

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

diff --git a/.github/workflows/kotlin_ci.yml b/.github/workflows/kotlin_ci.yml
index e21f6538..e3e5bf3d 100644
--- a/.github/workflows/kotlin_ci.yml
+++ b/.github/workflows/kotlin_ci.yml
@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Pull changes from head branch into target branch
-      run: git pull origin main
+      run: git pull origin main --rebase
 
     - name: Set up JDK 17
       uses: actions/setup-java@v4