tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-11-28 03:47:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge latest using Xours (#815)

Browse Source 
* chore: merge latest using Xours

* try letting it resolve type of ff

* derp
This commit is contained in:
Jacob Bolda 2020-07-12 09:18:41 -05:00 committed by GitHub
parent 3417bf5fbe
commit 0eddf6444f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pr-to-latest.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
git config --global user.name "${{ github.event.pusher.name }}"
git config --global user.email "${{ github.event.pusher.email }}"
- run: git fetch origin dev
- run: git merge ${{ github.sha }} --no-ff
- run: git merge -Xours ${{ github.sha }}
- name: Create Pull Request
uses: tauri-apps/create-pull-request@v2.8.0
with: