#131 more debugging (now fixed)

vaadin-miki · Jun 13, 2020 · 164101c · 164101c
1 parent 01e2402
commit 164101c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml
@@ -61,9 +61,9 @@ jobs:
           git checkout ${{ github.event.ref }}
           git config user.email "${{ secrets.EMAIL }}"
           git config user.name "Miki (bot)"
-          git diff release-${{ github.event.ref }} master
+          git diff ${{ github.event.ref }} master
           git merge master --strategy=ours --no-ff --no-commit -v --progress
-          git diff release-${{ github.event.ref }} master
+          git diff ${{ github.event.ref }} master
       - name: Push resolved conflicts
         uses: stefanzweifel/git-auto-commit-action@v4.1.6
         with: