Merging before sending a patch ?

[Martin Pool]

On Sun, Mar 30, 2008 at 4:33 AM, Aaron Bentley <aaron at aaronbentley.com> wrote:
> -----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.

I think the policy is that you can use your own judgement on whether
to merge before submitting.  We do generally want to see changes that
are smaller rather than larger as long as they do something useful and
are tested etc.  I'm not sure which one Xavier was referring to.

-- 
Martin <http://launchpad.net/~mbp/>