[automated] Merge branch 'main' => 'dev'

[github-actions]

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

This PR merges commits made on main by the following committers:

• danmoseley
• 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.

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 main
git pull --ff-only
git checkout dev
git pull --ff-only
git merge --no-ff main

# 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/extensions HEAD:merge/main-to-dev

or if you are using SSH

git push [email protected]:dotnet/extensions HEAD:merge/main-to-dev

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

git checkout -b merge/main-to-dev dev
git pull https://github.com/dotnet/extensions merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/extensions HEAD:merge/main-to-dev

or if you are using SSH

git checkout -b merge/main-to-dev dev
git pull [email protected]:dotnet/extensions merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/extensions HEAD:merge/main-to-dev

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.

Microsoft Reviewers: Open in CodeFlow

[radical]

I tried to resolve the conflicts here but I'm not sure at all that I'm picking the correct bits for dev branch. @RussKie could you please help?

[RussKie]

I tried to resolve the conflicts here but I'm not sure at all that I'm picking the correct bits for dev branch. @RussKie could you please help?

Sure thing. I'll take over.

[RussKie]

@f-alizada could you please update the "Instructions for updating this pull request" to be -B. I noted that previously -b is not correct switch, because it won't make git to switch and reset branch if the local branch already exists.

[f-alizada]

Hello @RussKie.
Thank you for the reminder, here the PR: dotnet/arcade#14971 for instructions update.
The -b switch is used so we could fail fast, instead of resetting the already existing branch and possibly erasing some local changes while using -B.
It is expected for the operation to fail if the local branches exist.

[RussKie]

The -b switch is used so we could fail fast, instead of resetting the already existing branch and possibly erasing some local changes while using -B.
It is expected for the operation to fail if the local branches exist.

You seem to be making generalisations - could you please clarify who are "we" in this context? I don't see how these instructions are helping me here to "fail fast", instead they are slowing me down and leaving me confused...
Secondly, when I'm (or anyone else for this matte) resolving merge conflicts in this context - i.e. merging changes from main to dev - erasing which local changes should I be worried about? Anything I do in here must be fully re-runnable and repeatable.

[f-alizada]

Thank you for the feedback and sorry for the confusions: By "we" I mean engineers who perform action described in the provided instructions.

The case I'm refering to is:

• There are local changes in the some-branch-name not published yet
• Running the command: git checkout -B some-branch-name start-point overrides the local changes from the already existing branch.

Could you please clarify what exactly is confusing in the instructions or results of commands provided?
also is there a chance you could share if the instructions generated previously (before the migration) by https://github.com/dotnet/arcade/blob/main/scripts/GitHubMergeBranches.ps1 weren't leading to the same result?
Thank you in advance