From 95c21a5367b7aff5d26f9cf2eda949e692b17928 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Fri, 15 Nov 2024 10:25:48 +0800 Subject: [PATCH] auto merge code to pr branch --- .github/workflows/merge_master_to_pr_branch.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/merge_master_to_pr_branch.yml b/.github/workflows/merge_master_to_pr_branch.yml index 11a93e1..2400130 100644 --- a/.github/workflows/merge_master_to_pr_branch.yml +++ b/.github/workflows/merge_master_to_pr_branch.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - - - name: Fetch all branches - run: git fetch --all + with: + fetch-depth: 0 # Fetch all history for all branches and tags + + - name: Check out pull_request + run: git checkout pull_request - name: Merge master into pull request - run: | - git checkout pull_request - git merge origin/master + run: git merge origin/master - name: Push changes run: git push origin pull_request