mirror of
https://github.com/zumbiepig/MineXLauncher.git
synced 2025-06-08 09:24:48 +00:00
Update compile-clients.yml
Signed-off-by: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
This commit is contained in:
parent
31133b0e5a
commit
06c9389445
2
.github/workflows/compile-clients.yml
vendored
2
.github/workflows/compile-clients.yml
vendored
@ -52,5 +52,5 @@ jobs:
|
|||||||
if: steps.git-auto-commit-action.outputs.changes_detected == 'true'
|
if: steps.git-auto-commit-action.outputs.changes_detected == 'true'
|
||||||
run: |
|
run: |
|
||||||
git checkout dev
|
git checkout dev
|
||||||
git merge --rebase --allow-unrelated-histories main
|
git merge --allow-unrelated-histories ${{ steps.git-auto-commit-action.outputs.commit_hash }}
|
||||||
git push origin dev
|
git push origin dev
|
||||||
|
Loading…
x
Reference in New Issue
Block a user