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 10:02:15 +0300 Message-ID: <834movnjm0.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> <551FA115.5090400@gmx.at> <834mowp7cj.fsf@gnu.org> <55200A71.9040902@gmx.at> <83oan3onki.fsf@gnu.org> <87sicffqma.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428217362 26475 80.91.229.3 (5 Apr 2015 07:02:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 07:02:42 +0000 (UTC) Cc: rudalics@gmx.at, sorganov@gmail.com, emacs-devel@gnu.org To: "Stephen J. Turnbull" , Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 09:02:32 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 1YeeZk-0001Qn-0n for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 09:02:32 +0200 Original-Received: from localhost ([::1]:35398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeeZj-0002Vm-C5 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 03:02:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeeZf-0002Vh-Jz for emacs-devel@gnu.org; Sun, 05 Apr 2015 03:02:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeeZa-0003pO-Rs for emacs-devel@gnu.org; Sun, 05 Apr 2015 03:02:27 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:33411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeeZa-0003pI-LC; Sun, 05 Apr 2015 03:02:22 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NMB00300NIHWY00@mtaout26.012.net.il>; Sun, 05 Apr 2015 10:03:25 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMB002DUNLPTJ10@mtaout26.012.net.il>; Sun, 05 Apr 2015 10:03:25 +0300 (IDT) In-reply-to: <87sicffqma.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:184901 Archived-At: > From: "Stephen J. Turnbull" > Cc: martin rudalics , > sorganov@gmail.com, > emacs-devel@gnu.org > Date: Sun, 05 Apr 2015 07:58:05 +0900 > > I looked at the current version. Thanks. > If the uncommitted files were inadvertant (typical beginner > mistake), your advice to commit, pull again, and fix the conflicts > is appropriate. But this doesn't work for Richard, who deliberately > leaves some changes uncommitted. Why doesn't it work? Because changes he didn't want to commit just yet will end up committed? I think this is a small price to pay for avoiding to learn about stashing, and for having what is mostly the same workflow he and others had with CVS. Richard, is this aspect going to be a problem for you?