Make conflict comments more visible#5452
Merged
premun merged 2 commits intodotnet:mainfrom Nov 10, 2025
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR introduces a new CommentType.Caution enum value to distinguish conflict-related warnings from other types of warnings in pull request comments. The change improves the visual presentation of conflict notifications by using GitHub's [!CAUTION] markdown alert instead of [!IMPORTANT].
Key changes:
- Adds
CommentType.Cautionenum value to categorize conflict-related comments - Replaces
CommentType.WarningwithCommentType.Cautionfor conflict scenarios in pull request updates - Adds a visual conflict header ("🛑 Conflict detected") to manual conflict resolution comments
- Makes
GetPreviousSourceShamethod static (optimization)
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/Microsoft.DotNet.Darc/DarcLib/CommentCollector.cs | Adds Caution to the CommentType enum |
| src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestCommenter.cs | Adds handling for CommentType.Caution to render as [!CAUTION] markdown alert |
| src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestUpdater.cs | Changes conflict-related comments from Warning to Caution type and makes GetPreviousSourceSha static |
| src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestCommentBuilder.cs | Adds conflict detection emoji header to manual conflict resolution comments |
dkurepa
previously approved these changes
Nov 10, 2025
dkurepa
approved these changes
Nov 10, 2025
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
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.
Example: dotnet/dotnet#3273 (comment)