You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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?
The text was updated successfully, but these errors were encountered:
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.
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?
The text was updated successfully, but these errors were encountered: