Fast-forwarded to origin/dev

This commit is contained in:
2024-12-28 14:18:29 +01:00
parent 8f6c4ec147
commit a20db99608

View File

@@ -75,5 +75,9 @@ runs:
run: | run: |
log_info "Fast-forwarding master to dev" log_info "Fast-forwarding master to dev"
git checkout master git checkout master
git merge --ff-only dev git fetch origin dev
git rev-list master
log_info "dev"
git rev-list origin/dev
git merge --ff-only origin/dev
git push git push