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/8.0.1xx' => 'release/8.0.2xx' #7207

Conversation

dotnet-maestro-bot
Copy link

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

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

  • v-wuzhai
  • dotnet-maestro[bot]

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/8.0.1xx
git pull --ff-only
git checkout release/8.0.2xx
git pull --ff-only
git merge --no-ff release/8.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-maestro-bot/templating-1 HEAD:merge/release/8.0.1xx-to-release/8.0.2xx
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.1xx-to-release/8.0.2xx

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

git checkout -b merge/release/8.0.1xx-to-release/8.0.2xx release/8.0.2xx
git pull https://github.com/dotnet-maestro-bot/templating-1 merge/release/8.0.1xx-to-release/8.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.1xx-to-release/8.0.2xx
or if you are using SSH
git checkout -b merge/release/8.0.1xx-to-release/8.0.2xx release/8.0.2xx
git pull git@github.com:dotnet-maestro-bot/templating-1 merge/release/8.0.1xx-to-release/8.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.1xx-to-release/8.0.2xx

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 and others added 2 commits October 26, 2023 12:33
…025.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4
…fcd-c8ac-4db9-a037-4efe7fe8b16f

[release/8.0.1xx] Update dependencies from dotnet/arcade
@dotnet-maestro-bot dotnet-maestro-bot requested review from GangWang01 and a team as code owners October 27, 2023 05:54
Copy link
Member

@MiYanni MiYanni left a comment

Choose a reason for hiding this comment

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

Our version of Arcade is really messed up between the branches here in Templating. We need to fix the codeflows for it and then update it to the right version in the branches.

@v-wuzhai
Copy link
Member

Superseded by #7211.

@v-wuzhai v-wuzhai closed this Oct 30, 2023
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