From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Tue, 15 Sep 2015 09:24:19 +0900 Message-ID: <87613czg0c.fsf@uwakimon.sk.tsukuba.ac.jp> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> <83613ebypk.fsf@gnu.org> <20150914104914.GB3208@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1442276697 6786 80.91.229.3 (15 Sep 2015 00:24:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 15 Sep 2015 00:24:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Sep 15 02:24:43 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 1Zbe38-00020u-D5 for ged-emacs-devel@m.gmane.org; Tue, 15 Sep 2015 02:24:42 +0200 Original-Received: from localhost ([::1]:44268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zbe37-0002Mw-J3 for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 20:24:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zbe2t-0002CR-GZ for emacs-devel@gnu.org; Mon, 14 Sep 2015 20:24:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zbe2p-0007Vs-IX for emacs-devel@gnu.org; Mon, 14 Sep 2015 20:24:27 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:39413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zbe2p-0007UL-9I for emacs-devel@gnu.org; Mon, 14 Sep 2015 20:24:23 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 04F991C3909; Tue, 15 Sep 2015 09:24:20 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id DB60D11EF83; Tue, 15 Sep 2015 09:24:19 +0900 (JST) In-Reply-To: <20150914104914.GB3208@acm.fritz.box> X-Mailer: VM undefined under 21.5 (beta34) "kale" ffb5abc8dc4e XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:189957 Archived-At: Alan Mackenzie writes: > Yes. I had misunderstood "conflict". I had thought it meant a merge > conflict in some file, whereas it just meant that other, possibly > unrelated, changes had taken place. No, "conflict" means that there are conflicts in a file so that the expected outcome of the merge is indeterminate, just like every other VCS. There could be a bug in git's implementation, but this terminology is standard in git as in other VCSes.