Skip to content

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

Merged
dougbu merged 4 commits into
dotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2
Mar 15, 2019
Merged

[automated] Merge branch 'release/2.1' => 'release/2.2'#1259
dougbu merged 4 commits into
dotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2

Conversation

@dotnet-maestro-bot

Copy link
Copy Markdown
Contributor

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:

Instructions for merging from UI

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

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/2.1
git pull --ff-only
git checkout release/2.2
git pull --ff-only
git merge --no-ff release/2.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/release/2.1-to-release/2.2
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/Common HEAD:merge/release/2.1-to-release/2.2

After PR checks are complete push the branch

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.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/Common merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common merge/release/2.1-to-release/2.2
or if you are using SSH
git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull git@github.com:dotnet-maestro-bot/Common merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/Common merge/release/2.1-to-release/2.2

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.

dougbu and others added 3 commits March 14, 2019 15:53
- needed to get latest Microsoft.Extensions.Logging.Testing package
- reorder PatchConfig.props while adding 2.1.10 section
- need the latest baseline even though Extensions wasn't included
- cleanup
- update designer
- update PatchConfig.props
@dotnet-maestro-bot

Copy link
Copy Markdown
Contributor Author

This pull request has been updated.

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

@dougbu

dougbu commented Mar 15, 2019

Copy link
Copy Markdown

@HaoK please double-check the merge of your 2.1.10 change. If you approve too, I'll get this in once the checks complete

@dougbu
dougbu force-pushed the merge/release/2.1-to-release/2.2 branch from 0bf425b to 01e9cf3 Compare March 15, 2019 05:00
@dougbu
dougbu merged commit e2f51bb into dotnet:release/2.2 Mar 15, 2019
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 12, 2020
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 15, 2020
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Feb 28, 2020
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Mar 2, 2020
@ghost ghost locked as resolved and limited conversation to collaborators May 29, 2023
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