emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master has switched from Automake to GNU Make


From: Stephen Leake
Subject: Re: master has switched from Automake to GNU Make
Date: Sun, 26 Mar 2017 08:03:01 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (windows-nt)

martin rudalics <address@hidden> writes:

>> That sounds wrong. It never happens to me, I expect because my
>> workflow differs. Can you give a way to reproduce your problem?
>> Perhaps there's a way we can fix the Git configuration so that it
>> doesn't happen to you in the future.
>
> It might be related to the fact that I use git entirely from within
> Emacs, git tells me that my terminal is dumb and explicitly asks me to
> commit what I pulled even when there were no conflicts.  

That sounds like line ending mismatch.


-- 
-- Stephe



reply via email to

[Prev in Thread] Current Thread [Next in Thread]