From 4ae5936f0104236fcedd78b218d2004e8e08c9a0 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Fri, 15 Nov 2024 10:17:19 +0800 Subject: [PATCH] auto merge code to pr branch --- .github/workflows/merge_master_to_pr_branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_master_to_pr_branch.yml b/.github/workflows/merge_master_to_pr_branch.yml index a1b3874..11a93e1 100644 --- a/.github/workflows/merge_master_to_pr_branch.yml +++ b/.github/workflows/merge_master_to_pr_branch.yml @@ -17,11 +17,11 @@ jobs: - name: Merge master into pull request run: | - git checkout ${{ github.event.pull_request.head.ref }} + git checkout pull_request git merge origin/master - name: Push changes - run: git push origin HEAD:${{ github.event.pull_request.head.ref }} + run: git push origin pull_request if: success() env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}