Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

flesh out automated rebase script #1075

Merged
merged 1 commit into from
Jun 2, 2024
Merged

flesh out automated rebase script #1075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions .github/workflows/sync-with-upstream.yml
View file
Open in desktop
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
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now stuck on this release, as there are conflicts to resolve. Upstream is currently at Electron v30 so I feel like I want to drop some commits to see if we can get this to work cleanly...

git status
git log development...linux --oneline --reverse
shell: bash
# TODO: force push this when we're confident that the rebase has succeeded?
Loading