File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change 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)
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
You can’t perform that action at this time.
0 commit comments