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 'vs17.8' => 'vs17.9' #10073

Merged
merged 19 commits into from Apr 29, 2024

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on vs17.8 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 vs17.8
git pull --ff-only
git checkout vs17.9
git pull --ff-only
git merge --no-ff vs17.8

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

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

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

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 dotnet-maestro-bot requested a review from a team as a code owner April 24, 2024 18:44
Copy link
Contributor

Hello! I noticed that you're targeting one of our servicing branches. Please consider updating the version.

Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

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

Reminder to merge, not squash

@surayya-MS surayya-MS merged commit 66473e3 into dotnet:vs17.9 Apr 29, 2024
8 checks passed
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.

None yet

7 participants