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.
On 10/08/2012 07:48 PM, Carlos Enrique Contreras Vara wrote: purchase. py that has been modified.
> Dear Lorenzo
>
> How can I do a merge correctly without conflicts because its only one
> line o code of purchase/
>
You changed a file from openobject- addons/ 6.1 branch and proposed to server/ trunk.
merge it into openobject-
You should put your branch under the openobject-addons project addons/ 6.1 branch.
(something like
lp:~carlos-realsystems/openobject-addons/6.1-bugfix-954189) and propose
to merge into openobject-
Regards
-- www.agilebg. com
Lorenzo Battistini <email address hidden>
Via BrĂ¼sighell - 6807 - Taverne - Switzerland
Agile Business Group sagl http://