It would be useful if the pipelines conflict resolution tool ignored line endings. As at present if you have one file with LF line endings and another with CRLF it will show the whole file as different, where as that is not the case, it's just line endings. Most other devOps tools work in this way.

There is another idea to ignore whitespace in apex comparisons - but this should also be extended to conflict resolution.