← Back to team overview

openerp-community team mailing list archive

Thread
Date

Re: [Merge] lp:~joao-gama/openerp-product-attributes/product_weight into lp:openerp-product-attributes

To: Joao Alfredo Gama Batista <joao.gama@xxxxxxxxxxxxxxxxxxxx>
From: "Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>
Date: Fri, 18 Jan 2013 12:53:28 -0000
In-reply-to: <20130117154142.18356.89443.launchpad@ackee.canonical.com>
Reply-to: mp+143710@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

The 7.0 branch will have the same issue, the 'common ancestor' of the branches have to be the same than the extra-addons otherwise the merges won't work correctly.
-- 
https://code.launchpad.net/~joao-gama/openerp-product-attributes/product_weight/+merge/143710
Your team OpenERP Community is subscribed to branch lp:openerp-product-attributes.

References

[Merge] lp:~joao-gama/openerp-product-attributes/product_weight into lp:openerp-product-attributes
From: Joao Alfredo Gama Batista, 2013-01-17