conflicts: whitespace parsing fixes #4944
Merged
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
ilyagr
reviewed
Nov 22, 2024
ilyagr
reviewed
Nov 22, 2024
yuja
approved these changes
Nov 22, 2024
Currently, conflict markers ending in CRLF line endings aren't allowed. I don't see any reason why we should reject them, since some editors/tools might produce CRLF automatically on Windows when saving files, which would break the conflicts otherwise.
Some editors strip trailing whitespace on save, which breaks any diffs which have context lines, since the parsing function expects them to start with a space. There's no visual difference between " \n" and "\n", so it seems reasonable to accept both.
scott2000
force-pushed
the
conflict-whitespace-fixes
branch
from
7f2da27 to
196fbef
Compare
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.
I noticed these while working on #4897 and I thought I'd make a PR for them.
Checklist
If applicable:
CHANGELOG.md