Is it possible for
git merge to ignore line-ending differences?
Maybe I'm asking the wrong question … but:
I tried uisng
config.crlf input but things got a bit messy and out of control, specially when I applied it after the fact.
For one thing, applying this config after the fact doesn't seem to affect files that were committed to the repository before applying this option. Another thing is that suddenly all commits now result in lots of annoying warning messages about CRLF being converted to LF.
To be honest, I don't really care what line-ending is used, I personally prefer the Unix style
\n, but whatever. All I care about, is for
git merge to be a bit smarter and ignore the differences in line-endings.
Sometimes I have two identical files, but git would mark them as being in conflict (and the conflict is the whole file) simply because they use a different line ending character.
I found out that
git diff accepts a
--ignore-space-at-eol option, would it be possible to let
git merge use this option as well?