[Python-Dev] devguide: managing "+1 heads"

[Antoine Pitrou]

On Wed, 16 Mar 2011 02:37:21 +0100
Jesus Cea <jcea at jcea.es> wrote:
> 
> Maybe a simple "try to keep the history lineal, as possible" and "feel
> free to merge heads in the standard mercurial way".

Well, can you propose a patch to add or improve wording?

> For instance, merging between branches (in which direction) is
> established here, but not in the devguide.

It is:
http://docs.python.org/devguide/committing.html#forward-porting

Regards

Antoine.