#131 debugging

vaadin-miki · Jun 11, 2020 · d9ae8f4 · d9ae8f4
1 parent d5ca5f9
commit d9ae8f4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml
@@ -53,6 +53,7 @@ jobs:
           branch: ${{ github.event.ref }}
       - name: Resolve conflicts (keep ours)
         run: |
+          git remove -v
           git fetch origin/master
           git merge origin/master --strategy=ours
       - name: Push resolved conflicts