Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

[automated] Merge branch 'release/2.1' => 'release/2.2'#2158

Merged
weshaggard merged 1 commit intodotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2
Aug 31, 2018
Merged

[automated] Merge branch 'release/2.1' => 'release/2.2'#2158
weshaggard merged 1 commit intodotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2

Conversation

@dotnet-maestro-bot
Copy link

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2.
I'm a robot and am configured to help you automatically keep release/2.2 up to date, so
I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

  • @danmosemsft

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR
by creating a merge commit, not a squash or rebase commit.

merge button instructions

You can also do this on command line:

git checkout release/2.2
git pull
git fetch --force https://github.com/dotnet-maestro-bot/buildtools-1 merge/release/2.1-to-release/2.2:merge/release/2.1-to-release/2.2
git merge merge/release/2.1-to-release/2.2
git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging.
You can do this using GitHub
or using the command line.

Maintainers of this repo have permission to the branch 'merge/release/2.1-to-release/2.2' on https://github.com/dotnet-maestro-bot/buildtools-1.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on release/2.1.

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

…roduce resources for System.Runtime.CompilerServices.Unsafe.dll (dotnet#2127)
@weshaggard weshaggard merged commit d6b9f0f into dotnet:release/2.2 Aug 31, 2018
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.

3 participants