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: Fri, 03 Apr 2015 10:06:25 +0300 Message-ID: <83y4m9pu6m.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> <87iodgiqr8.fsf@uwakimon.sk.tsukuba.ac.jp> <20150401123241.GB2633@acm.fritz.box> <83h9syr3ac.fsf@gnu.org> <551DB570.4070908@dancol.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428044810 18320 80.91.229.3 (3 Apr 2015 07:06:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 07:06:50 +0000 (UTC) Cc: rms@gnu.org, schwab@suse.de, hanche@math.ntnu.no, emacs-devel@gnu.org, acm@muc.de, stephen@xemacs.org To: Daniel Colascione Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 09:06:40 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 1Ydvge-00036U-7P for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 09:06:40 +0200 Original-Received: from localhost ([::1]:32828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydvgd-0006JF-1H for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 03:06:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdvgY-0006J9-TT for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:06:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdvgV-0006mx-Kn for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:06:34 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:53425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdvgV-0006m0-Cv; Fri, 03 Apr 2015 03:06:31 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NM700H00Y90NL00@a-mtaout22.012.net.il>; Fri, 03 Apr 2015 10:06:30 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM700H65YETJC70@a-mtaout22.012.net.il>; Fri, 03 Apr 2015 10:06:30 +0300 (IDT) In-reply-to: <551DB570.4070908@dancol.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184809 Archived-At: > Date: Thu, 02 Apr 2015 14:32:32 -0700 > From: Daniel Colascione > CC: schwab@suse.de, stephen@xemacs.org, hanche@math.ntnu.no, rms@gnu.org, > emacs-devel@gnu.org > > When I develope a major new feature, it's usually because I'm scratching > some personal itch. I want to take advantage of whatever the feature > provides while I develop it. I also want to use the latest bugfixes and > unrelated features from Emacs trunk. Regularly rebasing my feature work > on top of trunk is the best way to accomplish both goals. I prefer to let more people use the features I develop, so I generally try to merge to master as soon as possible. Then the issue with merges from master and rebasing is solved automatically. Even if I wanted to use the feature only by myself for a while, I'd probably start a new branch, separate from development, which would be a mirror of master with my changes applied. Anyway, all this just means is our development methodologies differ; nothing wrong with that. I described mine because I presume it should be easier on people whose Git proficiency is just starting to be built.