Actually we are maintaining our code with bzr. In that we have created four branches: - bzr branch lp:openerp-web/7.0 web, bzr branch lp:openobject-addons/7.0 addons, bzr branch lp:openobject-server/7.0 server, bzr branch manual_addons
In all the above branches, the branch âmanual_addonsâ is just for the internal use. so now in this way the core code of openerp(server, web, addons) is as it is so that we can get update from the openerp without any code merging and problem.
But when we are taking the other branches code, then if are trying to merge with the standard openerp code, the we are facing so many issues like: deletion of files, file conflicts, modifies same files. and after we are not able to run the openerp server properly and without any error. so the question is How they(different branches code) are managing their code against the standard code, how they are getting updates from the standard openerp server without any loss or conflict?
