Skip to content

Commit 9305611

Browse files
authored
fix(sync_branches): always sync with merge commit (#249)
1 parent 713e0d9 commit 9305611

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/sync_branches_push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
git config pull.rebase false
6565
6666
git switch ${{ inputs.baseBranch }}
67-
git pull origin ${HEAD_BRANCH} --no-edit
67+
git pull origin ${HEAD_BRANCH} --no-edit --no-ff
6868
git push https://github-actions:${{ secrets.githubToken }}@github.com/${{ github.repository }}.git ${{ inputs.baseBranch }}:${{ inputs.baseBranch }}
6969
7070
- name: report failure to slack

0 commit comments

Comments
 (0)