diff --git a/.github/workflows/update-branches.yaml b/.github/workflows/update-branches.yaml index 6500fe7..6977f53 100644 --- a/.github/workflows/update-branches.yaml +++ b/.github/workflows/update-branches.yaml @@ -7,6 +7,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 fetch --all - run: git rebase osx main - run: git checkout osx - run: git merge main @@ -17,6 +18,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 fetch --all - run: git rebase arch main - run: git checkout arch - run: git merge main