phantop/quatalog-site
1
0
Fork 0
mirror of https://github.com/quatalog/site.git synced 2024-12-25 14:36:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squash

Browse source
This commit is contained in:
powe97 2024-03-16 16:46:48 -04:00
parent a8d16fb092
commit b21de8698c
No known key found for this signature in database
GPG key ID: 7D1663B10978D1BA
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/merge.yml vendored
View file

@ -26,7 +26,8 @@ jobs:
git config --global user.email "github_actions@quatalog.com" git config --global user.email "github_actions@quatalog.com"
git checkout main git checkout main
git checkout -b new-static-generated git checkout --orphan new-static-generated
git merge static-generated --allow-unrelated-histories git commit -m '${{ github.event.head_commit.message }}'
git merge static-generated --strategy-option ours --allow-unrelated-histories
git push -u -f origin HEAD:static-generated git push -u -f origin HEAD:static-generated