Merging before sending a patch ?

[Aaron Bentley]

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

Xavier Maillard wrote:
>    Hopefully people are fixing things and merging back on a fairly short
>    cycle, rather than accumulating very large branches, and so the
>    conflicts should be small.
> 
> Could it be mentionned somewhere (it may be already the case, I
> did not check though) if it is the project policy ?

I don't think that it should be project policy.  I do periodically merge
from trunk, and I feel that should be encouraged, because it avoids
conflicts down the line.

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

iD8DBQFH7n150F+nu1YWqI0RAnUwAJ9mfzFAk0Vi5ew+3l/FfNqj/DjWEgCfUEA4
kRBInpzkxcghU2Jaqp1ioK4=
=iE4A
-----END PGP SIGNATURE-----