Merge backport branches back into tree #4103
Closed
Conversation
This file contains hidden or 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
|
I'm fine with merging them into master so we don't have to keep additional branches around |
|
Added the latest beta backport too |
Manishearth
force-pushed
the
backport-merge
branch
from
7975591 to
199b257
Compare
|
I'm going to wait for the Symbol craziness to land first, and then we can merge this |
Manishearth
force-pushed
the
backport-merge
branch
from
199b257 to
11194e3
Compare
|
what |
|
oh. |
bors
added a commit
that referenced
this pull request
May 19, 2019
Merge backport branches into master Attempt 2 at #4103 This does nothing to the code, however it keeps the backport branches in master history, so that deleting a branch won't accidentally break old rustc builds
bors
added a commit
that referenced
this pull request
May 19, 2019
Merge backport branches into master Attempt 2 at #4103 This does nothing to the code, however it keeps the backport branches in master history, so that deleting a branch won't accidentally break old rustc builds
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.
This does nothing to the code, however it keeps the backport branches in master history, so that deleting a branch won't accidentally break old rustc builds
Another option is to keep all these merges in a separate single branch.
thoughts?
r? @oli-obk
changelog: none