mdiluz/matchy
mdiluz/matchy
1
0
Fork 0
Code Issues 5 Pull requests 7 Packages 1 Activity Actions

Add the user config and -X theirs to resolve conflicts

Browse source
This commit is contained in:
Marc Di Luzio 2024-08-10 22:44:49 +01:00
parent be52d51517
commit 183de82091
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/test.yml vendored
View file

@ -29,7 +29,9 @@ jobs:
- name: Update release branch - name: Update release branch
if: github.ref == 'refs/heads/main' if: github.ref == 'refs/heads/main'
run: | run: |
git config --local user.email "[hidden]"
git config --local user.name "CI"
git fetch origin git fetch origin
git checkout -b release origin/release git checkout -b release origin/release
git merge --no-ff origin/main git merge origin/main -X theirs
git push origin release git push origin release