Re: [AMBER-Developers] Please avoid DOS line endings

From: Gustavo Seabra <gustavo.seabra.gmail.com>
Date: Sat, 8 Feb 2020 21:18:43 +0000

I remember that, when installing GIT for Windows, it gives you the option to automatically convert line endings to Linux style when committing. It should be easy to set that as default behavior.

--
Gustavo Seabra
________________________________
From: Daniel Roe <daniel.r.roe.gmail.com>
Sent: Saturday, February 8, 2020 8:47:15 AM
To: AMBER Developers Mailing List <amber-developers.ambermd.org>
Subject: [AMBER-Developers] Please avoid DOS line endings
Hi All,
Today I encountered a nasty issue merging the master branch into a
branch I'm developing on. The problem was
src/pmemd/src/mdin_ctrl_dat.F90 now has DOS line endings in the master
branch, so when I try to merge the master version (with DOS) into mine
(without DOS) GIT gets confused and thinks the master version is
completely different, and the merge fails completely (I end up with
both versions of the file).
It's possible to get around this with:
git merge -s recursive -Xignore-space-at-eol master
but in my opinion this is a hack and shouldn't be part of regular
development workflow.
So please, if at all possible, avoid committing files with DOS line endings :-)
-Dan
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers

Received on Sat Feb 08 2020 - 13:30:01 PST