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

From: Gustavo Seabra <gustavo.seabra.gmail.com> Date: Tue, 11 Feb 2020 15:06:03 -0500

--
Gustavo Seabra.
On Sat, Feb 8, 2020 at 8:47 AM Daniel Roe <daniel.r.roe.gmail.com> wrote:
> 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