openerp-chinese-team team mailing list archive

["Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>]

Review: Resubmit

Hi,

I tried to merge your branch but I got an error:
╭─gbaconnier@yushan  ~openerp_root/e-commerce-addons/oerp6.1-stable
╰─$ b merge lp:~openerp-chinese-team/e-commerce-addons/chinese_translation
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.

Can you rebase on the branch please?

Thank you
-- 
https://code.launchpad.net/~openerp-chinese-team/e-commerce-addons/chinese_translation/+merge/124088
Your team Open ERP Chinese is subscribed to branch lp:~openerp-chinese-team/e-commerce-addons/chinese_translation.