chore: Resync fork with dsccommunity/AzureDevOpsDsc upstream#19
Open
ZanattaMichael wants to merge 5 commits into
Open
chore: Resync fork with dsccommunity/AzureDevOpsDsc upstream#19ZanattaMichael wants to merge 5 commits into
ZanattaMichael wants to merge 5 commits into
Conversation
Added note about the repository's maintenance status and recommendation for archiving.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR resyncs the
ZanattaMichael/AzureDevOpsDscfork with the original upstream repositorydsccommunity/AzureDevOpsDsc.Upstream commits being brought in
35470b1bd9ab0dc3e344f12fd9c57d7c962Conflict notes
The fork has diverged significantly from upstream (10 custom commits including new resources, managed identity support, documentation, and build script improvements). A number of merge conflicts exist — primarily in:
CHANGELOG.md.devcontainer/devcontainer.jsonsource/AzureDevOpsDsc.psd1These conflicts will need to be resolved manually before this PR can be merged.
Test plan
CHANGELOG.md,.devcontainer/devcontainer.json, andsource/AzureDevOpsDsc.psd1Generated by Claude Code