Hi, Stefan,
I have changed Wiki to assign me 12 of the 49 conflicts (for now) for
resolving manually bit by bit. Do you have any guide you want me to follow?
What I have tought is:
- Inspect the changes of the revision and see if the patch is already
inside (because Odoo has made it, but
On 03-07-14 10:02, Pedro Manuel Baeza Romero wrote:
Hi, Stefan,
I have changed Wiki to assign me 12 of the 49 conflicts (for now) for
resolving manually bit by bit. Do you have any guide you want me to
follow? What I have tought is:
* Inspect the changes of the revision and see if the
Pedro
Those 2 should be OK and integrated in official, already checked them on
first run of replay in February.
http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8696: [FIX]
report_webkit - change description for new webkit lib path parameter
(yannick.vauc...@camptocamp.com)
Thanks, Yannick, I'll write down this then on the wiki.
Regards.
2014-07-03 10:47 GMT+02:00 Yannick Vaucher yannick.vauc...@camptocamp.com:
Pedro
Those 2 should be OK and integrated in official, already checked them on
first run of replay in February.
On 02-07-14 20:30, Pedro Manuel Baeza Romero wrote:
Hi, Stefan,
Is there already something decided about the method to follow? I'm
starting to practise with git, and I think we can handle migration
with the approach you suggest (ocb-replay script and manually
processing the 49 conflicts). I
5 matches
Mail list logo
