lets go

Author: petesramek

.github/actions/push-changes/action.yml

@@ -42,10 +42,13 @@ runs:
         git config --global user.name "${{ github.actor }}"
         git config --global user.email "${{ github.actor }}@users.noreply.github.com"
         git add --  ${{ inputs.working-directory }}
+        git stash push --keep-index -- ${{ inputs.working-directory }} 
     - name: Check for changes in ${{ inputs.working-directory }}
       shell: bash
       run: |
-        git diff ${{ github.head_ref || github.ref }} origin/${{ inputs.target-branch }} --staged --quiet -- ${{ inputs.working-directory }}
+        git checkout -b ${{ inputs.target-branch }} origin/${{ inputs.target-branch }} --force
+        git stash apply
+        git diff --staged --quiet -- ${{ inputs.working-directory }}
       continue-on-error: true
       id: check-diff
     - name: Push changes to ${{ inputs.target-branch }}, if exists
@@ -57,8 +60,6 @@ runs:
       if: ${{ steps.check-diff.outcome == 'failure' }}
       shell: bash
       run: |
-        git stash push -- ${{ inputs.working-directory }}
-        git fetch origin
         git checkout -b ${{ inputs.target-branch }} origin/${{ inputs.target-branch }} --force
         git stash pop
         git commit -m'${{ inputs.commit-message }}' -- ${{ inputs.working-directory }}