Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Is this extension can correctly render mixed line endings? #5

Closed
Mingun opened this issue Feb 28, 2024 · 1 comment
Closed

Is this extension can correctly render mixed line endings? #5

Mingun opened this issue Feb 28, 2024 · 1 comment

Comments

@Mingun
Copy link

Mingun commented Feb 28, 2024

Today I got a merge conflict in my git working copy that was related to different line endings. It seems that part of lines ended with CR+LF and part with LF and the difference in some lines created a merge conflict. But when I tried this extension it showed me that all lines ended with the same sequence, which is configured in VSCode. I'm doubt that this was true, because then why git (GitKraken actually) shows me the difference?

So the question: did you rended actual line endings or just the configured one?

@Steditor
Copy link
Owner

See #1 and microsoft/vscode#127: VSC currently normalizes line endings, so this extension does not really do anything useful at the moment. It does show the actual line endings in the editor, but those are post-normalization.

Maybe you can try out #4 as a workaround.

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

No branches or pull requests

2 participants