Fix test-windows workflow powershell syntax & Run pre-commit when resolving conflicts on the release workflow

.github/workflows/release.yml

@@ -119,6 +119,7 @@ jobs:
             for f in $(git status | grep 'both modified' | awk '{ print $3 }')
             do
               git checkout --theirs $f
+              pre-commit run -av --files $f
               git add $f
             done
             git commit -a -m "Merge develop into stable(auto resolving conflicts to the develop version)"

.github/workflows/test-windows.yml

@@ -87,8 +87,7 @@ jobs:
 
       - name: Create Test Instance
         run: |
-          bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }} || \
-            (sleep 10 && bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }})
+          bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }}
 
       - name: Test Bootstrap
         run: |