flesh out automated rebase script #1075
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shiftkey
force-pushed
the
shiftkey/refine-rebase-approach
branch
from
9aacf77
to
ec32d72
Compare
shiftkey
force-pushed
the
shiftkey/refine-rebase-approach
branch
from
ec32d72
to
f705a80
Compare
shiftkey
commented
Jun 2, 2024
| git fetch origin linux | ||
| git checkout linux | ||
| git log development...linux --oneline --reverse | ||
| git rebase development linux |
There was a problem hiding this comment.
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...
shiftkey
added a commit
that referenced
this pull request
Jun 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.