From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 10:25:21 +0200 Message-ID: <551A59F1.3060602@math.ntnu.no> References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427790359 7337 80.91.229.3 (31 Mar 2015 08:25:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 08:25:59 +0000 (UTC) Cc: "Stephen J. Turnbull" , rms@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 10:25:57 2015 Return-path: Envelope-to: ged-emacs-devel@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 1YcrUg-0001NY-Is for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:25:54 +0200 Original-Received: from localhost ([::1]:37480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcrUf-0007rY-Q6 for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 04:25:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcrUc-0007rL-Ar for emacs-devel@gnu.org; Tue, 31 Mar 2015 04:25:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcrUY-0001lK-CC for emacs-devel@gnu.org; Tue, 31 Mar 2015 04:25:50 -0400 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:36031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcrUY-0001ku-5J; Tue, 31 Mar 2015 04:25:46 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 8507390108B; Tue, 31 Mar 2015 10:25:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [192.168.1.103] (235-32-8.connect.netcom.no [89.8.32.235]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 86FD290108A; Tue, 31 Mar 2015 10:25:41 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::225 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184592 Archived-At: Andreas Schwab wrote: > Harald Hanche-Olsen writes: > >> The *only* possible data loss is in lisp/ChangeLog, since that was (I >> believe) in an edited, uncommitted state when he did the pull. > > git would have refused to start the merge if that were the case. If you say so. But then why do we see this warning from =E2=80=9Cgit help= merge=E2=80=9D? Warning: Running git merge with non-trivial uncommitted changes is discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict. =E2=80=93 Harald