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: Wed, 01 Apr 2015 17:21:43 +0300 Message-ID: <83lhicrkso.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> <86ego5cp95.fsf@dod.no> <20150331154839.GE2871@acm.fritz.box> <87pp7phxt1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331204609.GG2871@acm.fritz.box> <87k2xwj11j.fsf@uwakimon.sk.tsukuba.ac.jp> <551B8DD0.1010800@math.ntnu.no> <87h9t0iam9.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427898154 2390 80.91.229.3 (1 Apr 2015 14:22:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 14:22:34 +0000 (UTC) Cc: acm@muc.de, hanche@math.ntnu.no, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 16:22:23 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 1YdJXD-0007Db-1a for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 16:22:23 +0200 Original-Received: from localhost ([::1]:52937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJXC-0000KG-Fj for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 10:22:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJWp-0000E2-FV for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:22:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdJWk-0007AD-61 for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:21:59 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:47130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJWj-00079k-UT for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:21:54 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NM400L00T8F2700@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Wed, 01 Apr 2015 17:21:52 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM400K42T8GV080@a-mtaout20.012.net.il>; Wed, 01 Apr 2015 17:21:52 +0300 (IDT) In-reply-to: <87h9t0iam9.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:184715 Archived-At: > From: "Stephen J. Turnbull" > Date: Wed, 01 Apr 2015 16:14:06 +0900 > Cc: Alan Mackenzie , emacs-devel@gnu.org > > > but Eli says he *should* pull before committing, so that can't be > > the reason. > > Eli says it's OK to do so; AFAIK Eli is basically neutral towards > others' preferred workflows. But I don't think Eli has a theory of > git that says it's OK, just his own experience. I explained in a previous message what I meant by "it's OK" in this case. > But I rather doubt Eli goes more than a couple days between pulls, > so he would be unlikely to see startling numbers of files touched, > whereas Richard is likely to run into that if he does have conflict. I generally pull every day, sometimes several times. I also have the git-merge-changelog driver installed, so conflicts due to ChangeLog files almost never happen to me.