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 'release/6.0.1xx' => 'release/6.0.4xx' #20240

Merged
merged 6 commits into from
Nov 15, 2024

Conversation

github-actions[bot]
Copy link

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

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

  • vseanreesermsft
  • marcpopMSFT
  • manodasanW

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 release/6.0.1xx
git pull --ff-only
git checkout release/6.0.4xx
git pull --ff-only
git merge --no-ff release/6.0.1xx

# 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/installer HEAD:merge/release/6.0.1xx-to-release/6.0.4xx
or if you are using SSH
git push [email protected]:dotnet/installer HEAD:merge/release/6.0.1xx-to-release/6.0.4xx

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/release/6.0.1xx-to-release/6.0.4xx'. 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/release/6.0.1xx-to-release/6.0.4xx origin/release/6.0.4xx
git pull https://github.com/dotnet/installer merge/release/6.0.1xx-to-release/6.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/installer HEAD:merge/release/6.0.1xx-to-release/6.0.4xx
or if you are using SSH
git fetch
git checkout -b merge/release/6.0.1xx-to-release/6.0.4xx origin/release/6.0.4xx
git pull [email protected]:dotnet/installer merge/release/6.0.1xx-to-release/6.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/installer HEAD:merge/release/6.0.1xx-to-release/6.0.4xx

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.

@github-actions github-actions bot force-pushed the merge/release/6.0.1xx-to-release/6.0.4xx branch from 6572f48 to 2faffe3 Compare November 12, 2024 22:24
@v-wuzhai v-wuzhai requested a review from a team November 13, 2024 07:58
@v-wuzhai
Copy link
Member

@dotnet/source-build Could you take a look at the failures here?

@NikolaMilosavljevic
Copy link
Member

@dotnet/source-build Could you take a look at the failures here?

Pushed a fix, to remove the msbuild patch that is not applicable.

@v-wuzhai v-wuzhai merged commit 67fe372 into release/6.0.4xx Nov 15, 2024
28 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/6.0.1xx-to-release/6.0.4xx branch November 15, 2024 05:52
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.

6 participants