From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Gregor Zattler Newsgroups: gmane.emacs.help Subject: git: Date: Thu, 26 Feb 2015 23:24:07 +0100 Message-ID: <20150226222407.GA18239@boo.workgroup> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1424989532 24974 80.91.229.3 (26 Feb 2015 22:25:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Feb 2015 22:25:32 +0000 (UTC) To: help-gnu-emacs Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Thu Feb 26 23:25:22 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 1YR6ry-000050-33 for geh-help-gnu-emacs@m.gmane.org; Thu, 26 Feb 2015 23:25:22 +0100 Original-Received: from localhost ([::1]:32947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YR6rx-0007By-DZ for geh-help-gnu-emacs@m.gmane.org; Thu, 26 Feb 2015 17:25:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YR6rd-00075M-J0 for help-gnu-emacs@gnu.org; Thu, 26 Feb 2015 17:25:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YR6ra-00028U-Di for help-gnu-emacs@gnu.org; Thu, 26 Feb 2015 17:25:01 -0500 Original-Received: from mout.gmx.net ([212.227.17.22]:62121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YR6ra-00028F-5l for help-gnu-emacs@gnu.org; Thu, 26 Feb 2015 17:24:58 -0500 Original-Received: from boo.workgroup ([87.185.131.214]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0LfkJC-1XkdUZ1NpC-00pKHe for ; Thu, 26 Feb 2015 23:24:57 +0100 Original-Received: from grfz by boo.workgroup with local (Exim 4.84) (envelope-from ) id 1YR6rF-0006DF-Ta; Thu, 26 Feb 2015 23:24:37 +0100 Mail-Followup-To: help-gnu-emacs Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:+t/O3JS8gQata8xdERLUXfQuMTdIpsowHn/DMZ0wnFV2ZGR0Cpk SUxWW4QY1OG+EOa0Uy1/JoqSt+yzCgGUnCApl/9vTq/YnsbgwJmREptr4jXL/3Q8rQC2ZW/ QRhn3sisfUSe0OoCqkTnLygWr8+YPQnyFpdGdGkfB1gOoLwh+bshJ7viWoxqqHuCQC66h3j ARGPg4FJ5baFSRJvV0fJQ== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.22 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:102907 Archived-At: 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 -- -... --- .-. . -.. ..--.. ...-.-