Re: Committer questions

Hi Nick On 19 Jan 2014, at 3:57 PM, Nick North wrote: > After reading Andy Wenk's really helpful Committer First > Stepsguide, I > feel pretty well informed on submitting code CouchDb code, but I > have just a few questions on commit etique

Re: Committer questions

No ff also preserves the knowledge that a branch was merged. I you can see the difference when running git log --graph. When a fast forward merge is performed it looks like all the merged commits were done directly on the current branch, merging with no ff shows them on another branch. Nick No

Re: Committer questions

Thanks Dirkjan. To clarify the --no-ff merge option: my understanding is that if this is specified, then git always performs an extra merge commit that makes it clear that a branch has been merged. This applies regardless of rebasing the branch on to master. The diagram here

Re: Committer questions

On Sun, Jan 19, 2014 at 2:57 PM, Nick North wrote: > 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 maste

Re: Committer questions

Many thanks Andy, and I'll definitely update the wiki once any other answers are in, Nick On 19 January 2014 17:12, Andy Wenk wrote: > Hi Nick, > > On 19 January 2014 14:57, Nick North wrote: > > > After reading Andy Wenk's really helpful Committer First > > Steps

Re: Committer questions

Hi Nick, On 19 January 2014 14:57, Nick North wrote: > After reading Andy Wenk's really helpful Committer First > Stepsguide, I > feel pretty well informed on submitting code CouchDb code, but I > have just a few questions on commit etiquett

Committer questions

After reading Andy Wenk's really helpful Committer First Stepsguide, 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 m