#131 syntax error when git merge?

vaadin-miki · Jun 11, 2020 · 25a823b · 25a823b
1 parent 85cb0c4
commit 25a823b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml
@@ -55,7 +55,7 @@ jobs:
         run: |
           git remote -v
           git fetch origin master
-          git merge origin master --strategy=ours
+          git merge master --strategy=ours
       - name: Push resolved conflicts
         uses: stefanzweifel/git-auto-commit-action@v4.1.6
         with: