Open Stack

On 06/10/2013 05:17 AM, Rosa, Andrea (HP Cloud Services) wrote:
> Hi all,
>
> I have a change  https://review.openstack.org/26020 which has a +4 (from 4 different people, one of them is a core-reviewer), I think It's good to go but I need a core reviewer to get it approved, anyone is available?
>
> My last patch is seven days old  and has a new DB migration script so it's likely to hit a conflict (actually I have just checked that I do have a conflict with a new DB script with the same version number), what is the best strategy in this case?:
> - wait for the final approval and fix the conflicts afterwards
> - or keep rebasing my changes. In that case I lose the positive votes :(

The latter. If you did the former, you'd still need to get approval 
again, as Jenkins would -1 Verify the patch and reset the Need Approval 
due to the code changing from the rebase.

It sucks, but there isn't a better solution that I know of.

Best,
-jay