search

dotnet / buildtools

Build tools that are necessary for building the .NET Core projects
477 stars 240 forks source link

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

Closed dotnet-maestro-bot closed 5 years ago

dotnet-maestro-bot commented 5 years ago

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 repo does not appear to allow merge commits from the GitHub UI, so you will need to update this PR with a merge commit before closing this PR.

git fetch
git checkout release/2.2
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/2.2
# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
git push https://github.com/dotnet-maestro-bot/buildtools-1 HEAD:merge/release/2.2-to-master
or if you are using SSH ``` git push git@github.com:dotnet-maestro-bot/buildtools-1 HEAD:merge/release/2.2-to-master ```

After PR checks are complete push the branch

git push

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.

dotnet-maestro-bot commented 5 years ago

This pull request has been updated.

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

dotnet-maestro-bot commented 5 years ago

This pull request has been updated.

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

dotnet-maestro-bot commented 5 years ago

This pull request has been updated.

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

dotnet-maestro-bot commented 5 years ago

This pull request has been updated.

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

dotnet-maestro-bot commented 5 years ago

This pull request has been updated.

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

dotnet-maestro-bot commented 5 years ago

This pull request has been updated.

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

ericstj commented 5 years ago

No one is consuming master of build tools so I think we can close this. Reopen if anyone thinks otherwise. /cc @wtgodbe @dagood @RussKeldorph

RussKeldorph commented 5 years ago

@jashook