conflicts: use clearer wording for missing newline comment #5515
Conversation
This file contains 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
Git doesn't show this information in their "diff3" style either, and it looks a bit strange having two different bracketed sections of text next to each other, so I think it would be better to remove it.
The current comment uses `[noeol]`, which can be difficult to understand. In this commit, the brackets are changed to parentheses to make it clear that there is no semantic meaning to the comment, and the wording is changed to be more clear to the user.
martinvonz
approved these changes
Jan 30, 2025
arxanas
approved these changes
Jan 31, 2025
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.
Suggested by @arxanas in #5497 (review)
Checklist
If applicable:
CHANGELOG.md