diff --git a/.github/workflows/command-compile.yml b/.github/workflows/command-compile.yml index ec0737c6..bc888d66 100644 --- a/.github/workflows/command-compile.yml +++ b/.github/workflows/command-compile.yml @@ -100,7 +100,8 @@ jobs: if: ${{ contains(needs.init.outputs.arg1, 'rebase') }} run: | git fetch origin ${{ needs.init.outputs.base_ref }}:${{ needs.init.outputs.base_ref }} - git rebase ${{ needs.init.outputs.base_ref }} + git status + git rebase origin/${{ needs.init.outputs.base_ref }} - name: Commit and push default if: ${{ !contains(needs.init.outputs.arg1, 'fixup') && !contains(needs.init.outputs.arg1, 'amend') }}