mirror of
https://github.com/community-scripts/ProxmoxVE
synced 2025-02-13 03:09:17 +00:00
Update merge-main.yml
This commit is contained in:
parent
4ead90ef0b
commit
6981774662
2
.github/workflows/merge-main.yml
vendored
2
.github/workflows/merge-main.yml
vendored
@ -23,7 +23,7 @@ jobs:
|
||||
run: |
|
||||
git fetch origin
|
||||
git checkout update-app-headers
|
||||
git merge origin/main --no-ff --no-commit -m "Merge main into update-app-headers"
|
||||
git merge origin/main --allow-unrelated-histories --no-commit -m "Merge main into update-app-headers"
|
||||
git push origin update-app-headers > /dev/null 2>&1 || true
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
Loading…
Reference in New Issue
Block a user