brightside/Proxmox-arm64
1
0
Fork 0
forked from forkanization/Proxmox-arm64
Code Pull Requests Activity

Update merge-main.yml

Browse Source
This commit is contained in:
CanbiZ
2025-01-10 17:09:58 +01:00
committed by GitHub
parent 4ead90ef0b
commit 6981774662
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/merge-main.yml
+1 -1
View File
@@ -23,7 +23,7 @@ jobs:
run: | run: |
git fetch origin git fetch origin
git checkout update-app-headers 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 git push origin update-app-headers > /dev/null 2>&1 || true
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}