Re: avoiding rejects

[Arnd Bergmann <arnd@arndb.de>]

On Tuesday 10 July 2007, Geert Uytterhoeven wrote:
> 
> > Most of these lists are unordered anyway, so inserting the new item at a
> > randomly-chosen position is a better approach than just appending it.
> 
> Really?
> 
> #includes should be sorted alphabetically
> Lots of other stuff should be sorted numerically/alphabetically
> 

I would also argue that adding in an ordered way is better than
at random positions, that is if the list is ordered to start with.
As long as everyone follows the same order, you will get (desired)
conflicts in case two people try to add the same line, and when
the added lines are different, it's as good as random ordering
to avoid undesired merge conflicts.

	Arnd <><