ci: Improve git merge strategy by adding --no-rebase param

antonbsa · Feb 18, 2025 · ff9e551 · ff9e551
1 parent df3f79a
commit ff9e551
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/actions/merge-branches/action.yml b/.github/actions/merge-branches/action.yml
@@ -14,4 +14,4 @@ runs:
         git config user.name "BBB Automated Tests"
         git config user.email "[email protected]"
         git config pull.rebase false
-        git pull origin pull/${{ github.event.number }}/head:${{ github.head_ref }}
+        git pull --no-rebase --no-edit origin pull/${{ github.event.number }}/head:${{ github.head_ref }}