[Developers] Repeated merge tasks?

[Tom Morris]

On Fri, Feb 27, 2009 at 1:01 PM, Ed Laurent <spatial.db at gmail.com> wrote:
> I've tried to help out with merges but never
> understood the "Wins" part of it when most of the merges I've seen don't
> have conflicts or there could be different reasons for "Winning". If all the
> data are in the first topic but the name is correct in the second and the
> article is better in the first, which should be the winner? Some guidance
> would be helpful.

This is actually covered reasonable well in the help topic, but you
need to spot the little tiny question mark icon way off to the right
and have enough confidence that it won't have the usual help text
saying something trite like "Click one of the buttons" :-) to click
through.  It took me a long time (weeks) before I thought to look
there and try and figure out what was what with merging.

Having said that, I think that there are probably some cases that
could have been automerged which were getting presented to users
increasing the confusion.  Perhaps it was thinking that type =
"/common/topic" and type = ["/common/topic", "/people/person"] was a
conflict or something similar that a human wouldn't consider a
conflict.  Of course this is mostly of historical interest now that
the two stages have been merged.

Tom