#131 now fetching before merging

vaadin-miki · Jun 10, 2020 · d5ca5f9 · d5ca5f9
1 parent c1be9fe
commit d5ca5f9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml
@@ -52,7 +52,9 @@ jobs:
           commit_message: "(bot) version and release notes updated to ${{ steps.what-version.outputs.version }}"
           branch: ${{ github.event.ref }}
       - name: Resolve conflicts (keep ours)
-        run: git merge master --strategy=ours
+        run: |
+          git fetch origin/master
+          git merge origin/master --strategy=ours
       - name: Push resolved conflicts
         uses: stefanzweifel/git-auto-commit-action@v4.1.6
         with: