Table of Contents
After you have downloaded the latest BigWorld version, it will be nescessary at some point to migrate the official BigWorld release into your own repository. This chapter aims to outline some issues you may encounter in that process and how you can avoid or alleviate them.
The best approach to use for merging two branches together is to use a fresh checkout of both branches so that no changes are lost due to confusion about their origin. Ideally any modifications that are specific to your project will be located in project specific libraries or directories that are not modified by BigWorld. This will help to speed up the merge process and help to make the type of changes that you need to deal with much simpler.
If you have either committed the Python generated bytecode .pyc files, or have a copy of them in the
directory you are merging into, please ensure that you remove these files
prior to merging. As the version of Python has been updated, this will
help to remove any conflicts that may arise from mis-matching files. To
remove all bytecode files at once you can perform the following
commands:
For Windows users:
del /s *.pyc
For Linux users:
find . -name '*.pyc' | xargs rm -f