[bind10-dev] Order of merging

[Shane Kerr]

Michal,

On Monday, 2013-01-21 16:54:18 +0100, 
Michal 'vorner' Vaner <michal.vaner at nic.cz> wrote:
> 
> I'd like to ask for one small thing. When you're merging a branch, to
> master, do that and not the other way around, eg:
> 
> $ git checkout master
> $ git merge tracXXXX
> 
> Not:
> $ git checkout tracXXXX
> $ git merge master
> $ git checkout master
> $ git merge tracXXXX

Following up here...

Personally I don't really have any preference, but I do agree with
Aharen-san that we should follow our documented practice.

Do we have any consensus at all? (I didn't sense one.)

Cheers,

--
Shane
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <https://lists.isc.org/pipermail/bind10-dev/attachments/20130131/fd5b64af/attachment.bin>