Skip to content

Commit

Permalink
flesh out script further
Browse files Browse the repository at this point in the history
  • Loading branch information
shiftkey committed Jun 2, 2024
1 parent 865701f commit ec32d72
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions .github/workflows/sync-with-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,22 @@ jobs:
git config --global user.email "[email protected]"
git remote add upstream https://github.com/desktop/desktop.git
shell: bash
- name: Fetch and merge
id: fetch-merge
- name: Push development changes from upstream to fork
id: sync-development-branch
run: |
git fetch upstream
git fetch upstream development
git fetch origin development
git checkout -b development upstream/development
git push origin development
shell: bash
- name: Rebase Linux customizations on top of development branch
id: rebase-linux-branch
run: |
git fetch origin linux
git checkout linux
git log development...linux --oneline --reverse
git rebase development linux
git status
git log development...linux --oneline --reverse
shell: base
# TODO: force push this when we're confident that the rebase has succeeded?

0 comments on commit ec32d72

Please sign in to comment.