Skip to content

Conversation

@isra-fel
Copy link
Member

@isra-fel isra-fel commented Nov 5, 2025

Description

Resolved conflicts in change log of Storage, SignalR, etc.
Removed conflicts from legacy code of FrontDoor.

Mandatory Checklist

  • SHOULD update ChangeLog.md file(s) appropriately
    • Update src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md.
      • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header in the past tense.
    • Should not change ChangeLog.md if no new release is required, such as fixing test case only.
  • SHOULD regenerate markdown help files if there is cmdlet API change. Instruction
  • SHOULD have proper test coverage for changes in pull request.
  • SHOULD NOT adjust version of module manually in pull request

@azure-client-tools-bot-prd
Copy link

Thanks for your contribution! The pull request validation has started. Please revisit this comment for updated status.

@isra-fel isra-fel added the Do Not Squash 🚫 To prevent conflicts, this PR should not be squash merged. label Nov 5, 2025
@github-actions
Copy link

github-actions bot commented Nov 5, 2025

‼️ Do NOT use squash to merge this pull request. All the commits must be merged to the target branch.
‼️ Enable "Allow merge commits" in the pull request settings. Select "Merge Commits" to merge the PR. Then go back to settings and disable the option.

@isra-fel isra-fel changed the base branch from Daily/Release_20251029112126 to main November 5, 2025 01:22
@isra-fel
Copy link
Member Author

isra-fel commented Nov 5, 2025

Targeted to main. Replacing #28780

@dolauli dolauli merged commit 54bab20 into Azure:main Nov 5, 2025
16 checks passed
@isra-fel isra-fel deleted the az14.6-conflcit branch November 5, 2025 04:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Do Not Squash 🚫 To prevent conflicts, this PR should not be squash merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants