From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/80506 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.gnus.general Subject: Re: *bump* again Date: Fri, 04 Nov 2011 09:36:37 +0100 Organization: Probably a good idea Message-ID: References: <1318133487-45386-1-git-send-email-dave@boostpro.com> <82botobfzu.fsf@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1320395827 5365 80.91.229.12 (4 Nov 2011 08:37:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 4 Nov 2011 08:37:07 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M28789@lists.math.uh.edu Fri Nov 04 09:37:03 2011 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RMFGo-0007uQ-Qf for ding-account@gmane.org; Fri, 04 Nov 2011 09:37:03 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1RMFGf-0008JB-OD; Fri, 04 Nov 2011 03:36:53 -0500 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RMFGe-0008Iv-3B for ding@lists.math.uh.edu; Fri, 04 Nov 2011 03:36:52 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RMFGd-0007w2-AB for ding@lists.math.uh.edu; Fri, 04 Nov 2011 03:36:52 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RMFGb-0001F1-VJ for ding@gnus.org; Fri, 04 Nov 2011 09:36:49 +0100 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RMFGa-0007q3-FR for ding@gnus.org; Fri, 04 Nov 2011 09:36:48 +0100 Original-Received: from 62.113.137.5 ([62.113.137.5]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 04 Nov 2011 09:36:48 +0100 Original-Received: from sb by 62.113.137.5 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 04 Nov 2011 09:36:48 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 15 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 62.113.137.5 Mail-Copies-To: never User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/22.3 (gnu/linux) Cancel-Lock: sha1:GvudMITkp9Zh2jTDhGTjp+qzGYo= X-Spam-Score: -4.9 (----) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:80506 Archived-At: >>>>> Dave Abrahams : > You don't have a development/integration branch where things can go > during a feature freeze? Note to Lars: having separate branches and merging between them is _much_ less of a hazzle than in traditional version control tools (CVS, subversion, perforce). I know this by first hand experience. When you do get a conflict, git isn't any smarter than other version control tools, but git is quiet clever at avoiding conflicts. The development branch should be frequently merged with master, though. Maybe a bot could do it, with notifications to a human operator when it gets conflicts?