Merge pull request #158 from vaadin-miki/131-conflict-resolving

#131 could it be this simple?
vaadin-miki · Jun 10, 2020 · 01efd91 · 01efd91
2 parents 7d9efbf + c1be9fe
commit 01efd91
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml
@@ -51,6 +51,13 @@ jobs:
         with:
           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
+      - name: Push resolved conflicts
+        uses: stefanzweifel/git-auto-commit-action@v4.1.6
+        with:
+          commit_message: "(bot) resolved conflicts from master (kept development-$${ steps.what-version.outputs.version }})"
+          branch: ${{ github.event.ref }}
       - name: Create PR
         uses: UnforgivenPL/pull-request@v1
         with: