From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 21:06:09 +0300 Message-ID: <831tjymovi.fsf@gnu.org> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <87vbhbft9a.fsf@uwakimon.sk.tsukuba.ac.jp> <83619bnjsy.fsf@gnu.org> <87mw2nf01y.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428257195 16534 80.91.229.3 (5 Apr 2015 18:06:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 18:06:35 +0000 (UTC) Cc: stephen@xemacs.org, sorganov@gmail.com, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 20:06:26 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 1YeowD-000254-HM for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 20:06:25 +0200 Original-Received: from localhost ([::1]:37239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeowC-0000gH-FX for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:06:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeow0-0000fw-Ir for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:06:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yeovv-0000Zl-Ju for emacs-devel@gnu.org; Sun, 05 Apr 2015 14:06:12 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:62363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeovv-0000Zc-Br; Sun, 05 Apr 2015 14:06:07 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NMC00C00HYTMU00@a-mtaout21.012.net.il>; Sun, 05 Apr 2015 21:06:06 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC00C0JIA5JN80@a-mtaout21.012.net.il>; Sun, 05 Apr 2015 21:06:06 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:184953 Archived-At: > Date: Sun, 05 Apr 2015 13:42:04 -0400 > From: Richard Stallman > CC: eliz@gnu.org, sorganov@gmail.com, emacs-devel@gnu.org > > I typed 'git pull' in a terminal. Since that tends to spew lots of > output, I probably did not look at the output. I did not realize > there was any chance it might fail! I expected the possibility of > conflicts, but I expected to find out about them and fix them. That "failure" is just a different expression of conflicts, that's all. the underlying issues are the same, it's just that CVS was less verbose than Git in this case, and you are used to what CVS did, but not yet used to how Git reacts to such conflicts.