help-gnu-emacs
[Top][All Lists]
Advanced

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

Re: git:


From: J. David Boyd
Subject: Re: git:
Date: Fri, 27 Feb 2015 10:08:13 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (cygwin)

Gregor Zattler <address@hidden> writes:

> I build emacs from sources.  From time to  time I do git pull and then
> there is an error message like:
>
> error: Your local changes to the following files would be overwritten
> by merge:
>         lisp/mail/rmail.el
>
>
> $ git diff
> diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
> index 855a4c2..9d5f6de 100644
> --- a/lisp/mail/rmail.el
> +++ b/lisp/mail/rmail.el
> @@ -4810,7 +4810,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse 
> order.
>  
>  ;;;***
>  ^L
> -;;;### (autoloads nil "rmailsum" "rmailsum.el" 
> "e3943ef45946f10b9b5cab8097d7f271")
> +;;;### (autoloads nil "rmailsum" "rmailsum.el" 
> "e41d88a5c472a084090c2aad1ef4971f")
>  ;;; Generated autoloads from rmailsum.el
>  
>  (autoload 'rmail-summary "rmailsum" "\
>
>    
>
>
> how is this possible while I do not modify the sources, using git only
> as a transport for the sources (I'm no developer)?
>
> Any idea why this happens and what to do aginst this?
>
>
>
> Ciao, Gregor


I have the same thing happen occasionally .

I just go up a level, mv my 'emacs' to 'emacs.xxx' or something, and reclone
the directory.

Much faster than trying to figure out why, since I don't care really.

Dave




reply via email to

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