[bind10-dev] Order of merging

[Stephen Morris]

On 31/01/13 14:26, Michal 'vorner' Vaner wrote:
> 
> The documentation has been updated just when Aharen-san pointed it 
> out. I thought I sent an email with it then, but I probably hit 
> just the reply button instead of reply-all.

So are we mentioning the --no-ff switch in the documentation? (My
suggestion was to always use --no-ff when merging into master.)

Also, if we are recommending always merging the branch into master, do
we want to add something on dealing with the case where you find that
the copy of master on the server has been updated between the time you
merged and the time you are ready to push?

Stephen