diff --git a/action.yml b/action.yml index 5bc1646..91b2bbc 100644 --- a/action.yml +++ b/action.yml @@ -20,6 +20,8 @@ runs: steps: - name: Checkout repo uses: actions/checkout@v4 + with: + fetch-depth: '0' - name: Checking if ran on the dev branch run: | if [[ "${{ github.ref }}" != refs/heads/dev ]]; then @@ -75,5 +77,5 @@ runs: run: | log_info "Fast-forwarding master to dev" git checkout master - git merge --ff-only dev + git merge --ff-only origin/dev git push