From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Thu, 02 Apr 2015 14:32:32 -0700 Message-ID: <551DB570.4070908@dancol.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3INlJEV6JHg7dKq0NtxBHOk6sEX0Pnj9s" X-Trace: ger.gmane.org 1428010418 14143 80.91.229.3 (2 Apr 2015 21:33:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 21:33:38 +0000 (UTC) Cc: schwab@suse.de, stephen@xemacs.org, hanche@math.ntnu.no, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii , Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 23:33: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 1Ydmjf-0004mr-C9 for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 23:33:11 +0200 Original-Received: from localhost ([::1]:60220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydmje-00087Y-Ls for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 17:33:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdmjN-00087G-Qs for emacs-devel@gnu.org; Thu, 02 Apr 2015 17:32:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdmjK-0000Ig-62 for emacs-devel@gnu.org; Thu, 02 Apr 2015 17:32:53 -0400 Original-Received: from dancol.org ([2600:3c01::f03c:91ff:fedf:adf3]:56665) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdmjJ-0000HR-RJ; Thu, 02 Apr 2015 17:32:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dancol.org; s=x; h=Content-Type:In-Reply-To:References:Subject:CC:To:MIME-Version:From:Date:Message-ID; bh=TCZ9J4BOt4g9eXOEihlTSVoXRaqzolbMj0P4RFdlJSw=; b=dQhireuye+He8ie+tzp/Xj1PkJlXWQJzUBpGZxjNeWjT1+MccdbU5xbHMf4Vwz1mPNMLtKhQqcTFRy3VbXvfrfYbUKZPg3Hn1co9TVepGHFnHxezJ3tUrelcv9ou4MiTk0LYWpjjM7JZROscCMbJvLq4l2BLh7UifETkdxMY8UzhLEBSUWMRooCyWg4oG0kM390kIV7/DEopLxXVpwB37m51a2j/4nUVQOUjRuXCAyd35mSgJhzy1NG+y7Mxns/uHC5j5DY2tp5sPKHalb36xZIG+S0RH78Q2DwBbvk/lK0FUfXBx3F+hnUFt0Jvf2omCTkXb5Jq0Fr+nCh30A2wfg==; Original-Received: from [2620:10d:c083:10fb:2ab2:bdff:fe1c:db58] by dancol.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1Ydmj9-0001nN-He; Thu, 02 Apr 2015 14:32:39 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 In-Reply-To: <83h9syr3ac.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2600:3c01::f03c:91ff:fedf:adf3 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:184805 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --3INlJEV6JHg7dKq0NtxBHOk6sEX0Pnj9s Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 04/02/2015 07:52 AM, Eli Zaretskii wrote: >> Date: Wed, 1 Apr 2015 12:32:41 +0000 >> From: Alan Mackenzie >> Cc: Andreas Schwab , Harald Hanche-Olsen , >> rms@gnu.org, emacs-devel@gnu.org >> >> I do not constrain my git pulls exclusively to the times when I'm >> ready to make a sensible commit. >=20 > May I ask why do you pull (a.k.a. "merge from master") at all while > working on a feature? >=20 > Also, are we talking about you working on a feature branch, or about > working directly on master? >=20 > Generally, work that takes more than, say, an hour or two, and is > expected to involve a non-trivial amount of changes, is better done on > a separate branch, which you then merge onto master when you are done. > While working on such a branch, it makes little sense to merge from > master, because that just brings unrelated changes that could > potentially disrupt your development. Instead, wait until you are > finished with your changes, and then merge. If you do that, then the > potential conflicts due to pull/merge from master simply cannot > happen. 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. --3INlJEV6JHg7dKq0NtxBHOk6sEX0Pnj9s Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJVHbVwAAoJEN4WImmbpWBlxCEP/RGdEx2Y6gI0QOsDl38Pszye p/eedaAnSlLxqkVcaVb394EKSqZF+V0ipkc25VdqIbVY+K8Hml0SMI1bfPb/kBqT mJCFoLZWG0rJDjbv9sUmZExHOX0SuRQqWUsA9jTsxpYqDejyltr6+sVWD3wwUtWT otkvaSwinKzAU1eQ9Mx5cXEeIGIhxl7TiXg/eHW4fwpGXiVHEJzLScsgwFf/5feC F+mQg5QMS8wI6+qmC/3O9rDLNhHxBCc8GC/QFOB5FuBb2OceYK/2hV202GcwZ8nA n/YgQN/VxYcQpxW1VybAvbjzCSlHxZ5pZ/BaXxXv7/5QomTnBibm+K1aNDMxzR0Z AN3lXmSMi4ELWc+1vJQYCT6Qw4OJdS1R/nVYBK7f3cMkLFMpXlACpQLYallNicRe wcjQiNMOidnEhcEuqEXkVt+dXMi5HU5npj7G6AWhq/rCQktB6z/vXc9ylpOmOZLn AXhsT7x9vEdstWMt2ahU/SVRph2Goj5DOCe+T7P0M5WE6+wwNLkr77DKuaB3wWWe DCcOgvll6segg9K4W023n/1ZIm1+ZzxNGDSAwCeyXDfO+K/VRMzGdd1lnnlPS7qU v2DmOIOKBSQC9+tnjdXOZG2bpWUhMlJsQM+faL8b/BQpFRJjKse28V0oxFFrGDD1 Hmb6eHihZZRNW36ulbEJ =VaMY -----END PGP SIGNATURE----- --3INlJEV6JHg7dKq0NtxBHOk6sEX0Pnj9s--