From 43dc350b2d468241963e1255d6a1ad4b2aff1f95 Mon Sep 17 00:00:00 2001 From: 233dada <233dada@gmail.com> Date: Thu, 10 Oct 2024 00:30:50 +0800 Subject: [PATCH] Update Scheduled-Merge-Remote-Action.yml --- .github/workflows/Scheduled-Merge-Remote-Action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Scheduled-Merge-Remote-Action.yml b/.github/workflows/Scheduled-Merge-Remote-Action.yml index 2a662f6e..c870abe3 100644 --- a/.github/workflows/Scheduled-Merge-Remote-Action.yml +++ b/.github/workflows/Scheduled-Merge-Remote-Action.yml @@ -15,11 +15,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: master # set the branch to merge to + ref: master-auto # set the branch to merge to fetch-depth: 0 - name: Merge Upstream uses: exions/merge-upstream@v1 with: upstream: userXinos/HadesSpace # set the upstream repo upstream-branch: master # set the upstream branch to merge from - branch: master # set the branch to merge to + branch: master-auto # set the branch to merge to