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: Sat, 04 Apr 2015 18:14:58 +0300 Message-ID: <83vbhcncwd.fsf@gnu.org> References: <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> <86384lciin.fsf@dod.no> <83bnj7syd5.fsf@gnu.org> <87y4mbhnw1.fsf@gmail.com> <83wq1vrgbk.fsf@gnu.org> <87sicjggj6.fsf@gmail.com> <83ego2r2vc.fsf@gnu.org> <83lhi9phgd.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428160524 10427 80.91.229.3 (4 Apr 2015 15:15:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 15:15:24 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 17:15:15 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 1YePmy-00014R-PT for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 17:15:12 +0200 Original-Received: from localhost ([::1]:33409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePmx-0005X2-Iv for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 11:15:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePmo-0005SJ-UQ for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:15:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YePml-0001Ws-KS for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:15:02 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:59833) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePml-0001Vw-C5; Sat, 04 Apr 2015 11:14:59 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NMA00100F2XA000@mtaout24.012.net.il>; Sat, 04 Apr 2015 18:06:32 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMA00OHOFAW2E20@mtaout24.012.net.il>; Sat, 04 Apr 2015 18:06:32 +0300 (IDT) In-reply-to: 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.180 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:184869 Archived-At: > Date: Sat, 04 Apr 2015 10:48:03 -0400 > From: Richard Stallman > CC: emacs-devel@gnu.org > > > > I always commit an entire changeset -- that's why I use vc-dir -- but > > > the changeset is often not all of the files I have edited. Over a few > > > weeks I may have fixed a few bugs in different files. I commit the > > > different fixes separately. > > > Do you also push each such commit immediately, or do you wait for all > > of the fixes to be ready and committed, and then push them all in one > > go? > > I have only once tried to install changes with Git, so there is no > "usual" answer. This time, I committed two or three change sets, > separately. Then I think I did a pull again. My recommendation is to try pushing any change you commit that you feel is ready to be pushed, as soon as you can, preferably right after you commit it locally. That will drive the probability of merge conflicts during a pull even lower.