couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Davis <paul.joseph.da...@gmail.com>
Subject Re: Allowing merge commits to master branch
Date Wed, 07 Nov 2012 15:02:31 GMT
As far as I know, I'm the only one that has a significant dislike of merge
commits. I'm willing to call lazy consensus in favor of allowing them. I'll
plan on reenabling them in a day or two to allow time for anyone speak up.


On Wed, Nov 7, 2012 at 3:40 PM, Robert Newson <rnewson@apache.org> wrote:

> 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