Skip to content

Conversation

@akoeplinger
Copy link
Member

arcade provides a newer one now.

arcade provides a newer one now.
@akoeplinger
Copy link
Member Author

/cc @nohwnd

@nohwnd nohwnd enabled auto-merge (squash) August 21, 2025 15:50
@nohwnd nohwnd merged commit c8ffd9e into microsoft:main Aug 21, 2025
7 checks passed
@akoeplinger akoeplinger deleted the patch-1 branch August 21, 2025 22:03
@nohwnd
Copy link
Member

nohwnd commented Sep 2, 2025

image

This conflict from latest arcade update, I've fixed the conflict by taking the dotnet version, but not taking the vswhere entry. Let's see if that will re-appear on next insertion of arcade.

maybe something more is needed on arcade side?

@akoeplinger
Copy link
Member Author

that's expected since it touched the ~same lines, there's no way around having a conflict. you resolved it correctly.

This was referenced Oct 2, 2025
This was referenced Oct 24, 2025
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.

2 participants