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.13' => 'main' #11193

Closed
wants to merge 6 commits into from

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the vs17.13 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 vs17.13 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.13
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff vs17.13

# 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/msbuild HEAD:merge/vs17.13-to-main
or if you are using SSH
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.13-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/vs17.13-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

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

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

JanKrivanek and others added 3 commits December 12, 2024 21:19
…ages (#11177)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20241219.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24604.1 -> To Version 9.0.0-alpha.1.24619.1

* Bump version prefix to 17.13.2

* Reintroduce formatting preventing unintentional interbranch flow

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
@github-actions github-actions bot requested a review from a team as a code owner December 24, 2024 08:13
Copy link
Contributor Author

github-actions bot commented Jan 3, 2025

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs17.13, but I could not automatically push those to merge/vs17.13-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

2 similar comments
Copy link
Contributor Author

github-actions bot commented Jan 7, 2025

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs17.13, but I could not automatically push those to merge/vs17.13-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

Copy link
Contributor Author

github-actions bot commented Jan 9, 2025

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs17.13, but I could not automatically push those to merge/vs17.13-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs17.13, but I could not automatically push those to merge/vs17.13-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@SimaTian
Copy link
Member

This PR is empty now. It probably was merged via a different PR. Closing.

@SimaTian SimaTian closed this Jan 14, 2025
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.

4 participants