[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
git:
From: |
Gregor Zattler |
Subject: |
git: |
Date: |
Thu, 26 Feb 2015 23:24:07 +0100 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
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
--
-... --- .-. . -.. ..--.. ...-.-