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

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

Merged

Conversation

dotnet-maestro-bot
Copy link

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

@Eilon
Copy link
Contributor

Eilon commented Oct 17, 2018

@natemcmaster - Please merge ASAP so that future commits don't cause conflicts.

@natemcmaster natemcmaster merged commit 572aadf into aspnet:master Oct 17, 2018
mlorbetske pushed a commit to mlorbetske/DotNetTools that referenced this pull request Oct 31, 2018
mlorbetske pushed a commit to mlorbetske/DotNetTools that referenced this pull request Oct 31, 2018
mlorbetske pushed a commit that referenced this pull request Nov 1, 2018
Fix #502

Fix #492

Fix #491

Fix #486

Improves #489
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