From a20db996084ed9266e359efeebf461bb6b129815 Mon Sep 17 00:00:00 2001 From: Skydust Date: Sat, 28 Dec 2024 14:18:29 +0100 Subject: [PATCH] Fast-forwarded to origin/dev --- action.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 5bc1646..119a71f 100644 --- a/action.yml +++ b/action.yml @@ -75,5 +75,9 @@ runs: run: | log_info "Fast-forwarding master to dev" 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