From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: dboyd2@mmm.com (J. David Boyd) Newsgroups: gmane.emacs.help Subject: Re: git: Date: Fri, 27 Feb 2015 10:08:13 -0500 Message-ID: References: <20150226222407.GA18239@boo.workgroup> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1425049730 7885 80.91.229.3 (27 Feb 2015 15:08:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Feb 2015 15:08:50 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Feb 27 16:08:41 2015 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YRMWu-0000wg-3q for geh-help-gnu-emacs@m.gmane.org; Fri, 27 Feb 2015 16:08:40 +0100 Original-Received: from localhost ([::1]:37042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRMWt-0006nn-IH for geh-help-gnu-emacs@m.gmane.org; Fri, 27 Feb 2015 10:08:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRMWi-0006kr-Af for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 10:08:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRMWf-0007Sk-1a for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 10:08:28 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:46826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRMWe-0007Se-Qx for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 10:08:24 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YRMWa-0000ia-JS for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 16:08:21 +0100 Original-Received: from 169.15.136.127 ([169.15.136.127]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Feb 2015 16:08:20 +0100 Original-Received: from dboyd2 by 169.15.136.127 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Feb 2015 16:08:20 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 46 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 169.15.136.127 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (cygwin) Cancel-Lock: sha1:CvPrPGYhBNa/UeT5OCF3P/yuMNE= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:102921 Archived-At: Gregor Zattler 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