Skip to content

Clean up merge conflicts: revert Directory.Build.props and CosmosItemTests whitespace changes#5554

Merged
kirankumarkolli merged 2 commits into
users/kirankk/enable_exception_lessfrom
copilot/sub-pr-5205
Jan 14, 2026
Merged

Clean up merge conflicts: revert Directory.Build.props and CosmosItemTests whitespace changes#5554
kirankumarkolli merged 2 commits into
users/kirankk/enable_exception_lessfrom
copilot/sub-pr-5205

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Jan 14, 2026

Removes unintended changes from merge conflicts that introduced whitespace modifications and version bumps outside the scope of the exceptionless feature.

Changes

  • Directory.Build.props: Reverted DirectVersion from 3.40.1 back to 3.39.1
  • CosmosItemTests.cs: Removed 5,963 lines of whitespace-only changes
  • RequestMessage.cs: Removed carriage return characters while preserving the three exceptionless feature flags:
    • UseStatusCodeFor4041002
    • UseStatusCodeFor403
    • UseStatusCodeForBadRequest

Net result: Only the actual feature changes and diagnostics improvements remain.


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: kirankumarkolli <6880899+kirankumarkolli@users.noreply.github.com>
Copilot AI changed the title [WIP] Enable exceptionless for 404 and 403 status codes Clean up merge conflicts: revert Directory.Build.props and CosmosItemTests whitespace changes Jan 14, 2026
Copilot AI requested a review from kirankumarkolli January 14, 2026 20:52
@kirankumarkolli kirankumarkolli marked this pull request as ready for review January 14, 2026 21:17
@kirankumarkolli kirankumarkolli merged commit 002658a into users/kirankk/enable_exception_less Jan 14, 2026
1 check passed
@kirankumarkolli kirankumarkolli deleted the copilot/sub-pr-5205 branch January 14, 2026 21:17
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