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 18:36:32 +0200 Message-ID: <551ACD10.1070600@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> <551A59F1.3060602@math.ntnu.no> <551ABE91.4020408@math.ntnu.no> <83zj6trwss.fsf@gnu.org> 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 1427819839 25372 80.91.229.3 (31 Mar 2015 16:37:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 16:37:19 +0000 (UTC) Cc: schwab@suse.de, stephen@xemacs.org, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 18:37:07 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 1YczA1-0007PE-9t for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 18:37:05 +0200 Original-Received: from localhost ([::1]:39603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YczA0-0007EK-3x for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 12:37:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycz9w-0007Bi-Du for emacs-devel@gnu.org; Tue, 31 Mar 2015 12:37:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycz9v-0006BS-FX for emacs-devel@gnu.org; Tue, 31 Mar 2015 12:37:00 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:52706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycz9n-000693-BV; Tue, 31 Mar 2015 12:36:51 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id AA805660F3A; Tue, 31 Mar 2015 18:36:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.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 hylle06.itea.ntnu.no (Postfix) with ESMTPSA id F3148660F2C; Tue, 31 Mar 2015 18:36:44 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83zj6trwss.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.235 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:184653 Archived-At: Eli Zaretskii wrote: >> Date: Tue, 31 Mar 2015 17:34:41 +0200 >> From: Harald Hanche-Olsen >> Cc: stephen@xemacs.org, Richard Stallman, emacs-devel@gnu= .org >> >> But Richard just said that =E2=80=9Cchecking in=E2=80=9D=E2=80=9A to h= im, means putting it in >> the central repository. >> >> A better phrasing is: Commit, then pull. > > No, it's better for Richard to pull, then checkin. That's closer to > what he is used to, and even if there's trouble (pull fails due to > uncommitted changes), that trouble is closer in spirit to what he > would have in a similar situation with CVS and bzr, so it would be > easier for him to understand the situation and fix it. Okay, now you have me terminally confused. What do you mean by checkin here? Does it mean commit, or push? There is=20 a huge difference. To be more specific, my suggestion is git commit git pull deal with conflicts, if any, ending with another git commit git push Are you saying it is better for Richard to do git pull before git=20 commit, if he has uncommited changes? =E2=80=93 Harald