On Mon, Feb 24, 2014 at 9:01 PM, Nicolas Jeudy <nje...@tuxservices.com>wrote:
> > 2014-02-25 0:43 GMT+01:00 Raphael Valyi <rva...@gmail.com>: > >> --theirs > > > Can you explain --theirs ? > I actually try to maintain saas-3 with OCB merge with gihub and it is ok I > think. I just have many i18n conflict :) > So if you can explain --theirs I can test it and add Tuxservices to the > list of company that can maintain it :) > http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html So for i18n I suggest doing the first merge taking the official translations to fix conflicts. I don't remember exactly the command, but I could use --theirs upon all i18n/* files. I imagine bzr would have the same kind of pattern matching feature, but I didn't test. Also as a note, unlike Launchpad, Github makes it straightforward to compare two branches to keep things under control, even OCB/official. For instance: https://github.com/akretion/openerp-server/compare/7.0...ocb-7.0 https://github.com/akretion/openerp-addons/compare/7.0...ocb-7.0 or OCB / RS-OCB: https://github.com/akretion/openerp-addons/compare/ocb-7.0...rs-ocb-7.0 Regards. -- Raphaƫl Valyi Founder and consultant http://twitter.com/rvalyi <http://twitter.com/#!/rvalyi> +55 21 2516 2954 www.akretion.com
_______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp