Skip to content

Conversation

@github-actions
Copy link
Contributor

I detected changes in the release/10.0 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 release/10.0 by the following committers:

  • baronfel
  • ViktorHofer
  • 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/10.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0

# 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/command-line-api HEAD:merge/release/10.0-to-main
or if you are using SSH
git push git@github.com:dotnet/command-line-api HEAD:merge/release/10.0-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/release/10.0-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/release/10.0-to-main origin/main
git pull https://github.com/dotnet/command-line-api merge/release/10.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/command-line-api HEAD:merge/release/10.0-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/10.0-to-main origin/main
git pull git@github.com:dotnet/command-line-api merge/release/10.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/command-line-api HEAD:merge/release/10.0-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.

dotnet-maestro bot and others added 5 commits September 30, 2025 13:36
* Backflow from https://github.com/dotnet/dotnet / 8aba88f build 285155

[[ commit created by automation ]]

* Update dependencies from https://github.com/dotnet/dotnet build 285155
No dependency updates to commit

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Merge release/10.0 into darc-release/10.0-a08f2630-9474-4ea5-95a2-6a38569d290a

* Update dependencies from https://github.com/dotnet/dotnet build 289521
No dependency updates to commit

* Update dependencies from https://github.com/dotnet/dotnet build 289695
No dependency updates to commit

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
The release/* trigger was missing which means the last code flow happened on August 16th.
[release/10.0] TELL-MODE: Fix pipeline triggers in command-line-api official yml
@ViktorHofer ViktorHofer enabled auto-merge (squash) November 14, 2025 07:19
@ViktorHofer ViktorHofer disabled auto-merge November 14, 2025 07:21
@ViktorHofer ViktorHofer merged commit 945b3bc into main Nov 14, 2025
10 checks passed
@ViktorHofer ViktorHofer deleted the merge/release/10.0-to-main branch November 14, 2025 07:29
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