From: Gregor Zattler <telegraph@gmx.net>
To: help-gnu-emacs <help-gnu-emacs@gnu.org>
Subject: git:
Date: Thu, 26 Feb 2015 23:24:07 +0100 [thread overview]
Message-ID: <20150226222407.GA18239@boo.workgroup> (raw)
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
--
-... --- .-. . -.. ..--.. ...-.-
next reply other threads:[~2015-02-26 22:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 22:24 Gregor Zattler [this message]
2015-02-27 15:08 ` git: J. David Boyd
2015-02-28 0:03 ` git: Bob Proulx
2015-02-27 23:10 ` git: Michael Heerdegen
2015-02-27 23:57 ` git: Gregor Zattler
2015-02-28 0:24 ` git: Glenn Morris
2015-02-28 0:30 ` git: Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150226222407.GA18239@boo.workgroup \
--to=telegraph@gmx.net \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).