Re: merge conlict?

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: address@hidden,  address@hidden
> Date: Tue, 26 Jan 2010 10:11:34 -0500
> 
> > I agree with Óscar: this is a lot of potentially unnecessary work.
> 
> Who cares: it just describes my workflow, nothing more.  If/when I feel
> like such a workflow should be turned into a convention that other
> people should follow, rest assured that I'll do so in a separate thread.

Fine with me.  But since this issue comes up time and again here,
perhaps you should just say that, as a matter of policy, for now no
such effort is required or expected when features are merged and
committed to the trunk.