Skip to content

Commit 824e329

Browse files
committed
Use fast-forward/merge instead of rebase to fix history desync
1 parent d74ca91 commit 824e329

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/scheduled-releases.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
if: ${{ env.HAS_NEW_COMMITS == 'true' }}
5858
shell: pwsh
5959
run: |
60-
gh pr merge ${{ env.PR_NUMBER }} --auto --rebase
60+
# Should result in fast-forward unless branch histories diverge
61+
gh pr merge ${{ env.PR_NUMBER }} --auto --merge
6162
env:
6263
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)