Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 631B4D24E for ; Wed, 7 Nov 2012 14:40:36 +0000 (UTC) Received: (qmail 83054 invoked by uid 500); 7 Nov 2012 14:40:35 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 82958 invoked by uid 500); 7 Nov 2012 14:40:35 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 82930 invoked by uid 99); 7 Nov 2012 14:40:34 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 14:40:34 +0000 Received: from localhost (HELO mail-vc0-f180.google.com) (127.0.0.1) (smtp-auth username rnewson, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 14:40:34 +0000 Received: by mail-vc0-f180.google.com with SMTP id fl13so1555553vcb.11 for ; Wed, 07 Nov 2012 06:40:33 -0800 (PST) MIME-Version: 1.0 Received: by 10.58.249.201 with SMTP id yw9mr4432222vec.10.1352299233288; Wed, 07 Nov 2012 06:40:33 -0800 (PST) Received: by 10.52.69.79 with HTTP; Wed, 7 Nov 2012 06:40:33 -0800 (PST) In-Reply-To: References: Date: Wed, 7 Nov 2012 14:40:33 +0000 Message-ID: Subject: Re: Allowing merge commits to master branch From: Robert Newson To: "dev@couchdb.apache.org" Content-Type: multipart/alternative; boundary=047d7bacc07e6e20be04cde8b301 --047d7bacc07e6e20be04cde8b301 Content-Type: text/plain; charset=ISO-8859-1 I think the wiki is a redo-from-start tbh. We shunt everything to an archive, and curate a collection of good pages into a new one. But also off-topic. :P On 7 November 2012 14:32, Dave Cottlehuber wrote: > On 7 November 2012 15:26, Robert Newson wrote: > > All, > > > > After 1.3.0, we agreed to work on feature branches and bugfix branches, > and > > then merge the results down after review. > > > > We need a change to the git commit hooks to allow merge commits (they are > > currently prohibited). Can I get some votes pls? > > > > B. > > +1 > > Do any of these need updating (or consolidating)? > > http://wiki.apache.org/couchdb/Release_Procedure > http://wiki.apache.org/couchdb/Source%20Code%20Repository%20Organization > http://wiki.apache.org/couchdb/CommitPolicy > http://wiki.apache.org/couchdb/ContributorWorkflow > http://wiki.apache.org/couchdb/SourceCode > > Less important but here for completeness: > > http://wiki.apache.org/couchdb/Git_At_Apache_Guide > http://wiki.apache.org/couchdb/SVNvsGIT > http://wiki.apache.org/couchdb/GitSuccessCriteria > > A+ > Dave > --047d7bacc07e6e20be04cde8b301--