diff --git a/rebase/action.yml b/rebase/action.yml
index 546c6a06..12ab5f10 100644
--- a/rebase/action.yml
+++ b/rebase/action.yml
@@ -33,11 +33,13 @@ runs:
         token: ${{ inputs.token }}
 
     - name: 'Rebase'
+      id: rebase
       shell: bash
       run: |
-        git rebase "origin/${{ inputs.base }}"
+        git rebase "origin/${{ inputs.base }}" || echo '::set-output name=fail::true' && git rebase --abort
 
     - name: 'Push'
       shell: bash
+      if: steps.rebase.outputs.fail != 'true'
       run: |
         git push ${{ inputs.force == 'true' && "--force" }}