couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Garren Smith <gar...@apache.org>
Subject Re: Committer questions
Date Mon, 20 Jan 2014 08:45:36 GMT
Hi Nick


On 19 Jan 2014, at 3:57 PM, Nick North <north.n@gmail.com> wrote:

> After reading Andy Wenk's really helpful Committer First
> Steps<https://wiki.apache.org/couchdb/Committer_First_Steps>guide, I
> feel pretty well informed on submitting code CouchDb code, but I
> have just a few questions on commit etiquette (commitiquette?). I'm sure
> most of these are very obvious to more experienced users, so please bear
> with me while I sort out my initial misconceptions.
> 
> First I'm wondering about when it's OK to push work to the Apache
> repository. If you put out a non-controversial GitHub pull request, and
> there are no negative comments after a reasonable time, is it then fine to
> push it and merge to master, or does it need more positive confirmation?
Noah or Jan will be able to explain it better, but when commiting changes we often work via
lazy consensus. http://www.apache.org/foundation/glossary.html#LazyConsensus

> I'm hoping it's OK to go ahead, but don't want to raise the wrath of group
> by pushing code that needs more review.
> 
> When merging a feature branch to merge to master should you use --no-ff?
> 
> Are there times when you shouldn't merge to master? At the moment the 1.6
> release is underway, but I assume that pushing to master is still OK, as
> there is a separate release branch, so it feels as if it should be fine to
> merge code as soon s it's ready. Or is that too optimistic?
> 
> Thanks for your help, as always,
> 
> Nick


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