Skip to content

Commit

Permalink
fetching other branches before rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
ashton committed May 16, 2024
1 parent 05bebb9 commit 542ad67
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/update-branches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 542ad67

Please sign in to comment.