From 05bebb946929de1bae053c2c78d1ca6f89f1d655 Mon Sep 17 00:00:00 2001 From: Matheus Ashton Silva Date: Thu, 16 May 2024 16:39:05 -0300 Subject: [PATCH] fix rebase command --- .github/workflows/update-branches.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-branches.yaml b/.github/workflows/update-branches.yaml index 14ca96e..6500fe7 100644 --- a/.github/workflows/update-branches.yaml +++ b/.github/workflows/update-branches.yaml @@ -7,7 +7,9 @@ jobs: - uses: actions/checkout@v4 - run: git config user.name "github-actions[bot]" - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - run: git rebase --onto osx main + - run: git rebase osx main + - run: git checkout osx + - run: git merge main - run: git push update-arch-branch: runs-on: ubuntu-latest @@ -15,5 +17,7 @@ jobs: - uses: actions/checkout@v4 - run: git config user.name "github-actions[bot]" - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - run: git rebase --onto arch main + - run: git rebase arch main + - run: git checkout arch + - run: git merge main - run: git push