From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 8 Mar 2021 19:24:38 +0000 (+0000)
Subject: Use merge not rebase
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5ef415f3adbfcb5686b524daf3d8957ae55e595;p=thirdparty%2Ffreeradius-server.git

Use merge not rebase
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c1160678f7..5e00ce2ae39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -477,7 +477,7 @@ jobs:
         git remote set-url origin https://$USERNAME:$REPO_KEY@github.com/$REPO_NAME
         git fetch --no-recurse-submodules upstream +refs/heads/*:refs/remotes/upstream/* +refs/tags/*:refs/tags/upstream/*
         git checkout --progress --force -B upstream-branch "refs/remotes/upstream/$BRANCH"
-        git pull --rebase upstream "$BRANCH"
+        git merge "$BRANCH" --ff-only
         git push upstream "upstream-branch:$BRANCH"
         git push origin "upstream-branch:$BRANCH" || true
       env: