Odoo Server (MOVED TO GITHUB)

<<<<<< TREE in trunk??

Asked by Ben

Use the following command:
  bzr co https://launchpad.net/openerp openerp

I downloaded the script that use bazaar to setup a good up to date set of code to work with.

The './server/bin/tinyerp-server.py' script seems to have some SVN type tags in it. '<<<<<<< TREE'

Is this correct?... I thought the trunk was up to date & working... or is my understanding the problem?

Question information

Language:
English Edit question
Status:
Solved
For:
Odoo Server (MOVED TO GITHUB) Edit question
Assignee:
No assignee Edit question
Solved by:
Ben
Solved:
Last query:
Last reply:
Revision history for this message
Ben (bugthing) said : 		#1

I did this same this morning... all worked fine.

Thanks.

Revision history for this message
Mantavya Gajjar (Open ERP) (mga) said : 		#2

This is because of the Conflicts,
it seems that you change somethings in the file, and the changes from the server on the same line occures,

yes its the same as the svn, but its distributed system.

so to correct it,

if you do any changes, then keep it with you in the other file.

then do bzr revert
and apply the changes again.

the best way if you want to change somethings in the server, base module make your own branch, and merge from the trunk daily if you want latest too.

so there is no chance to conflict at all.