[automated] Merge branch 'maestro/release/2.2' => 'release/2.2' #13

Closed
opened 2025-08-09 17:14:40 +00:00 by fergalmoran · 0 comments
Owner

Originally created by @dotnet-maestro-bot on 10/11/2018

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

This PR merges commits made on maestro/release/2.2 by the following committers:

  • @aspnetci

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR
by creating a merge commit, not a squash or rebase commit.

merge button instructions

You can also do this on command line:

git checkout release/2.2
git pull
git fetch --force https://github.com/dotnet-maestro-bot/JavaScriptServices merge/maestro/release/2.2-to-release/2.2:merge/maestro/release/2.2-to-release/2.2
git merge merge/maestro/release/2.2-to-release/2.2
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.

Maintainers of this repo have permission to the branch 'merge/maestro/release/2.2-to-release/2.2' on https://github.com/dotnet-maestro-bot/JavaScriptServices.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on maestro/release/2.2.

Please 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.

*Originally created by @dotnet-maestro-bot on 10/11/2018* I detected changes in the maestro/release/2.2 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR. This PR merges commits made on maestro/release/2.2 by the following committers: * @aspnetci ## Instructions for merging This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> You can also do this on command line: ``` git checkout release/2.2 git pull git fetch --force https://github.com/dotnet-maestro-bot/JavaScriptServices merge/maestro/release/2.2-to-release/2.2:merge/maestro/release/2.2-to-release/2.2 git merge merge/maestro/release/2.2-to-release/2.2 git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub](https://help.github.com/articles/resolving-a-merge-conflict-on-github/) or using the [command line](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/). Maintainers of this repo have permission to the branch 'merge/maestro/release/2.2-to-release/2.2' on https://github.com/dotnet-maestro-bot/JavaScriptServices. You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt to update this branch as more changes are discovered on maestro/release/2.2. Please 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.
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github/JavaScriptServices#13
No description provided.