couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Robert Newson <rnew...@apache.org>
Subject Re: Allowing merge commits to master branch
Date Wed, 07 Nov 2012 14:40:33 GMT
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 <dch@jsonified.com> wrote:

> On 7 November 2012 15:26, Robert Newson <robert.newson@gmail.com> 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
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message