From 68676617a56beebbce2efe90be0dd8247aa69395 Mon Sep 17 00:00:00 2001 From: Matheus Ashton Silva Date: Mon, 28 Oct 2024 20:39:01 -0300 Subject: [PATCH] Update update-branches.yaml --- .github/workflows/update-branches.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-branches.yaml b/.github/workflows/update-branches.yaml index 3ad7a48..cc777fe 100644 --- a/.github/workflows/update-branches.yaml +++ b/.github/workflows/update-branches.yaml @@ -9,7 +9,7 @@ jobs: - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - run: git fetch --all - run: git checkout osx - - run: git merge main + - run: git merge origin/main - run: git push update-arch-branch: runs-on: ubuntu-latest @@ -19,5 +19,5 @@ jobs: - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - run: git fetch --all - run: git checkout arch - - run: git merge main + - run: git merge origin/main - run: git push