Skip to content
This repository was archived by the owner on Nov 1, 2018. It is now read-only.

[automated] Merge branch 'release/2.2' => 'feature/2.1-oob' #1532

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/2.2 branch which have not been merged yet to feature/2.1-oob. I'm a robot and am configured to help you automatically keep feature/2.1-oob 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-feature/2.1-oob feature/2.1-oob
git pull https://github.com/dotnet-maestro-bot/IISIntegration merge/release/2.2-to-feature/2.1-oob
git checkout feature/2.1-oob
git merge --no-ff merge/release/2.2-to-feature/2.1-oob
git push origin feature/2.1-oob

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

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.

@Eilon Eilon requested a review from jkotalik October 18, 2018 17:50
@Eilon
Copy link
Contributor

Eilon commented Oct 18, 2018

@jkotalik - please merge ASAP if needed, and if not, close.

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@pakrym pakrym merged commit 4b2603c into aspnet:feature/2.1-oob Oct 18, 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.

4 participants