Skip to content

Commit eee7b82

Browse files
committed
Rename branch
1 parent 2cae3ea commit eee7b82

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/sync.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
# Rebase the main branch with upstream
3535
- name: Rebase upstream changes onto downstream
3636
run: |
37-
git checkout main
38-
git rebase upstream/main || (git rebase --abort && echo "Rebase failed, skipping.")
37+
git checkout master
38+
git rebase upstream/master || (git rebase --abort && echo "Rebase failed, skipping.")
3939
4040
# Check for merge conflicts
4141
- name: Resolve conflicts (if any)
@@ -49,7 +49,7 @@ jobs:
4949
# Push changes to downstream repository
5050
- name: Push changes to downstream repository
5151
run: |
52-
git push origin main || (echo "Push failed. Check for conflicts or permissions." && exit 1)
52+
git push origin master || (echo "Push failed. Check for conflicts or permissions." && exit 1)
5353
5454
# Keep the workflow alive
5555
- uses: gautamkrishnar/keepalive-workflow@v1 # using the workflow with default settings

0 commit comments

Comments
 (0)