fix(merge): correct merging issue
This commit is contained in:
parent
2cc780e172
commit
b12f1fa179
1 changed files with 1 additions and 1 deletions
|
|
@ -57,5 +57,5 @@ jobs:
|
|||
git config --local user.name "Forgejo Actions"
|
||||
git fetch origin
|
||||
git checkout github || git checkout -b github
|
||||
git merge origin/main --no-edit
|
||||
git merge origin/main --no-edit --allow-unrelated-histories
|
||||
git push origin github
|
||||
Loading…
Add table
Reference in a new issue