Re: [Opengov] A few thoughts on Open Governance

[Oswald Buddenhagen]

On Thu, Nov 11, 2010 at 09:44:20PM +0100, Macieira Thiago (Nokia-MS-Qt/Oslo) 
wrote:
> On Thursday, 11 de November de 2010 20:51:27 Oswald Buddenhagen wrote:
> > > Not really. One merge is enough.
> > >
> > no, it's not, because mainline will have progressed because of other
> > integrations.
> 
> [...]
> If the merge fails, the requestor will merge C7 to F3 (exactly what the 
> server 
> tried) and fix the conflicts, creating M2. Then he submits M2 for 
> integration. 
> But at that time, mainline will have progressed to C8, so a new merge is 
> required. 
> 
> I don't call this merge spamming, it is the proper way to do things.
>
it is *exactly* the same as using pull instead of pull --rebase after
doing your two whimsy commits. it's a *superfluous* merge, as opposed to
the "proper" merges from and to mainline. i don't see why we should
exclude merge commits from the "avoid unnecessary merges" rule if we can
do better with rather little effort.
_______________________________________________
Opengov mailing list
Opengov@qt-labs.org
http://lists.qt-labs.org/listinfo/opengov