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?
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?
To make the ^M disappear in git, type:
git config --global core.whitespace cr-at-eol
Credits: https://lostechies.com/keithdahlby/2011/04/06/windows-git-tip-hide-carriage-return-in-diff/
If you don't have dos2unix utility installed on your system, you can create your own to get rid of Windows endline characters:
vi ~/dos2unix.bash:
with the following content
#!/bin/bash
tr -d '\r' < $1 > repl.tmp
mv -f repl.tmp $1
In your ~/.bashrc, add the line:
alias 'dos2unix=~/dos2unix.bash'
Applying
dos2unix file_from_PC.txt
will remove ^M characters at lines ends in file_from_PC.txt. You can check if you have those or not by using cat:
cat -v file_from_PC.txt
See also:
Be careful if you choose to remove the ^M characters and resubmit to your team. They may see a file without carriage returns afterward.
One of the most straightforward ways of gettings rid of ^Ms with just an emacs command one-liner:
C-x h C-u M-| dos2unix
Analysis:
C-x h: select current buffer
C-u: apply following command as a filter, redirecting its output to replace current buffer
M-| dos2unix: performs `dos2unix` [current buffer]
*nix platforms have the dos2unix utility out-of-the-box, including Mac (with brew). Under Windows, it is widely available too (MSYS2, Cygwin, user-contributed, among others).
The solution for me was to use the following elisp function found in this Emacs Wiki Article.
(defun dos2unix ()
"Not exactly but it's easier to remember"
(interactive)
(set-buffer-file-coding-system 'unix 't) )
Execute the function M-x dos2unix on the buffer and save the file, all ^M will disappear.