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

[automated] Merge branch 'release/2.2' => 'master' #2078

Merged
merged 1 commit into from Nov 20, 2018

Conversation

Projects
None yet
2 participants
@dotnet-maestro-bot

dotnet-maestro-bot commented Nov 20, 2018

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

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

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 -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/Identity merge/release/2.2-to-master
git checkout master
git merge --no-ff merge/release/2.2-to-master
git push origin master

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.2-to-master'. 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.2-to-master master
git pull https://github.com/dotnet-maestro-bot/Identity merge/release/2.2-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Identity merge/release/2.2-to-master

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.

@javiercn javiercn merged commit 4046c84 into aspnet:master Nov 20, 2018

3 of 4 checks passed

continuous-integration/appveyor/pr AppVeyor was unable to build non-mergeable pull request
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla All CLA requirements met.
Details
@javiercn

This comment has been minimized.

Member

javiercn commented Nov 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment