Tuesday, 15 September 2015

git - What are these ^M's that keep showing up in my files in emacs? -


So I guess what could happen to this textmate, but we work in a small team and some Issues full - file conflicts in almost identical files in GIT because one line of one branch is attached to ^ m.

What should this mysterious ^ M character do, and where is it coming?

Our developers use Emacs on Windows / Mac, Mac on Mac, Coda on Mac, and sometimes Wp-Admin Text Editor.

Any one of these

I think this is Windows Public because they like their CRLF. Unix loves LF and MAC loves CR until it shows unix paths.


No comments:

Post a Comment