Skip to content
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 'vs16.11' => 'main' #6409

Merged
merged 1 commit into from
May 4, 2021

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on vs16.11 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 vs16.11
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff vs16.11

# 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/msbuild HEAD:merge/vs16.11-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/msbuild HEAD:merge/vs16.11-to-main

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/vs16.11-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/vs16.11-to-main main
git pull https://github.com/dotnet-maestro-bot/msbuild merge/vs16.11-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/msbuild HEAD:merge/vs16.11-to-main
or if you are using SSH
git checkout -b merge/vs16.11-to-main main
git pull git@github.com:dotnet-maestro-bot/msbuild merge/vs16.11-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/msbuild HEAD:merge/vs16.11-to-main

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.

### Context

While mainline development is now focusing on 17.0, we want to have the 16.11 branch ready in case we end up contributing.

### Changes Made

Setting up a branch for MSBuild inserted into Visual Studio 16.11.

### Testing

Grepped the tree for other occurrences of 16.10.
Copy link
Member

@Forgind Forgind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Briefly thrown for a loop when I saw the update to 17.0. Not used to skipping a version.

@ladipro ladipro mentioned this pull request May 4, 2021
@ladipro ladipro merged commit 43bddb4 into dotnet:main May 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants