[bind10-dev] Order of merging

[Jelte Jansen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01/31/2013 02:53 PM, Shane Kerr wrote:
> 
> 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.)
> 

dunno if we have consensus, but I have also been doing what Michal
suggested.

Additionally, as has also been mentioned I think, I do --no-ff for
merges that would fast-forward. Doing the latter would make the
problem above less bad (or worse, as you would now get two merge
commits :p, but the last one would be the 'into master' one)

If our documented practice says otherwise I suggest we change that :)
Commit messages that reverse the real flow seem unnecessarily
confusing to me, imho.

Jelte
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlEKfQ0ACgkQ4nZCKsdOncWUXwCgg2Pa18czk5cklOM5hC0vzrMU
F3EAoN342VlFrI6xo01Uyys44eM7EOsz
=gKEB
-----END PGP SIGNATURE-----