Use fast-forward when merging upstream develop

E3SM-Project · Mar 18, 2024 · 720a5dc · 720a5dc
1 parent bd39633
commit 720a5dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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