Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Mirror changes from dotnet/coreclr #26478

Merged
merged 13 commits into from
Jan 22, 2018
Merged

Mirror changes from dotnet/coreclr #26478

merged 13 commits into from
Jan 22, 2018

Conversation

dotnet-bot
Copy link

This PR contains mirrored changes from dotnet/coreclr

Please REBASE this PR when merging

@ahsonkhan
Copy link

How do we get this change through?

Is it OK to close this PR and cherry-pick the commits from #25770 into #26444 instead when a new CoreCLR build is available?

@tarekgh, @jkotas

@jkotas
Copy link
Member

jkotas commented Jan 20, 2018

I think the mirror needs the exact mirror commit to show up in the history. It gets confused otherwise. @safern ?

The best workflow is probably going to be to append additional commits to the mirror PR to make it pass. It is the workflow we have been using for CoreCLR<->CoreRT mirror.

@tarekgh
Copy link
Member

tarekgh commented Jan 22, 2018

@jkotas is right. you'll need to add more commits here to fix this PR. note, your extra commits would be mirrored back to coreclr. so please ensure your changes is going to work in both repos.

@jkotas
Copy link
Member

jkotas commented Jan 22, 2018

I will take care of this one.

@jkotas jkotas force-pushed the mirror-merge-9496243 branch from f984454 to 0dcc53e Compare January 22, 2018 16:47
@jkotas jkotas merged commit 45d8e80 into master Jan 22, 2018
@weshaggard weshaggard deleted the mirror-merge-9496243 branch January 22, 2018 19:29
@karelz karelz added this to the 2.1.0 milestone Feb 4, 2018
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants