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