From b4c45a73c479cfd90c3a8c165a02fd983ee281f2 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 5bc1646..9a5a4af 100644 --- a/action.yml +++ b/action.yml @@ -75,5 +75,6 @@ runs: run: | log_info "Fast-forwarding master to dev" git checkout master - git merge --ff-only dev + git fetch origin dev + git merge --ff-only origin/dev git push