这些^ M在emacs中的文件中显示哪些？ [英] What are these ^M's that keep showing up in my files in emacs?

问题描述

所以我认为这可能与文本关系有关，但是我们在一个小团队中工作，并且在git中几乎完全相同文件的全文件冲突存在一些问题，因为一个分支的每行都附加了^ M

So I think it may have to do with textmate, but we work in a small team and are having some issues with full-file conflicts of nearly identical files in git because each line of one branch has a ^M appended to it.

这个神秘的人物应该是什么，而且从哪里来？

What is this mysterious ^M character supposed to do, and where could it be coming from?

我们的开发人员在Mac / Mac上使用emacs，Mac上的TextMate，Mac上的coda，有时也是wp-admin文本编辑器。

Our developers use emacs on Windows/Mac, TextMate on Mac, coda on Mac, and occasionally the wp-admin text editor.

任何人都有这个问题源于其中之一？

Anybody ever have this issue stemming from one of those?

推荐答案

有人没有正确转换其行尾字符。

我假设是Windows民间，因为他们喜欢他们的CRLF。 Unix喜欢LF和Mac喜欢的CR，直到显示出Unix的方式。

I assume it's the Windows folk as they love their CRLF. Unix loves LF and Mac loved CR until it was shown the Unix way.

这篇关于这些^ M在emacs中的文件中显示哪些？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！