From 720a5dc9158a8077745b45d314f4afa8efd0f18c Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Mon, 18 Mar 2024 12:58:10 -0600 Subject: [PATCH] Use fast-forward when merging upstream develop --- .github/workflows/sync_develop_with_upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_develop_with_upstream.yml b/.github/workflows/sync_develop_with_upstream.yml index e5f104ac6825..019120423269 100644 --- a/.github/workflows/sync_develop_with_upstream.yml +++ b/.github/workflows/sync_develop_with_upstream.yml @@ -32,6 +32,6 @@ jobs: git config --global user.email "lbertag@sandia.gov" git config --global user.name "Luca Bertagna" - name: Merge upstream develop - run: git merge upstream/develop + run: git merge upstream/develop --ff-only - name: Push to remote run: git push origin develop