Odoo Server (MOVED TO GITHUB)

Code review comment for lp://qastaging/~carlos-realsystems/openobject-server/trunk-bugfix-954189

  1. trunk-bugfix-954189
  2. Merge into trunk
Revision history for this message
Lorenzo Battistini (elbati) wrote :

On 10/08/2012 07:48 PM, Carlos Enrique Contreras Vara wrote:
> Dear Lorenzo
>
> How can I do a merge correctly without conflicts because its only one
> line o code of purchase/purchase.py that has been modified.
>

You changed a file from openobject-addons/6.1 branch and proposed to
merge it into openobject-server/trunk.

You should put your branch under the openobject-addons project
(something like
lp:~carlos-realsystems/openobject-addons/6.1-bugfix-954189) and propose
to merge into openobject-addons/6.1 branch.

Regards

--
Lorenzo Battistini <email address hidden>
Via Brüsighell - 6807 - Taverne - Switzerland
Agile Business Group sagl http://www.agilebg.com

« Back to merge proposal