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.

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

build: rebase release branch before reverting bump #30400

Merged
merged 1 commit into from
Aug 5, 2021

Conversation

MarshallOfSound
Copy link
Member

@MarshallOfSound MarshallOfSound commented Aug 4, 2021

Ensures that we rebase to the current upstream before trying to push a revert commit, handles a race condition between a release failing and a new commit landing on the upstream that would have prevented the revert being pushed.

Pairs up with https://github.com/electron/sudowoodo/pull/214

Notes: no-notes

@MarshallOfSound MarshallOfSound merged commit 59ab794 into main Aug 5, 2021
@MarshallOfSound MarshallOfSound deleted the rebase-before-revert branch August 5, 2021 17:49
@release-clerk
Copy link

release-clerk bot commented Aug 5, 2021

No Release Notes

@trop
Copy link
Contributor

trop bot commented Aug 5, 2021

I have automatically backported this PR to "11-x-y", please check out #30415

@trop
Copy link
Contributor

trop bot commented Aug 5, 2021

I have automatically backported this PR to "12-x-y", please check out #30416

@trop
Copy link
Contributor

trop bot commented Aug 5, 2021

I have automatically backported this PR to "14-x-y", please check out #30417

@trop
Copy link
Contributor

trop bot commented Aug 5, 2021

I have automatically backported this PR to "13-x-y", please check out #30418

@trop trop bot removed the target/14-x-y label Aug 5, 2021
@trop
Copy link
Contributor

trop bot commented Aug 5, 2021

I have automatically backported this PR to "15-x-y", please check out #30419

BlackHole1 pushed a commit to BlackHole1/electron that referenced this pull request Aug 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants