[bind10-dev] Order of merging

[Michal 'vorner' Vaner]

Hello

On Fri, Feb 01, 2013 at 03:32:46PM +0000, Stephen Morris wrote:
> So are we mentioning the --no-ff switch in the documentation? (My
> suggestion was to always use --no-ff when merging into master.)

I added it.

> 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?

Simply pull when it rejects your push. It'll merge the changes, allowing you to
resolve conflicts if any are present. Then you can push. I added it to the
documentation too.

With regards

-- 
echo '*' > 'rm -rf ~'; . *

Michal 'vorner' Vaner
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <https://lists.isc.org/pipermail/bind10-dev/attachments/20130204/1e7d10c7/attachment.bin>