Preparing Source Files
The Merge tool supports source files saved in Magic xpa 3.1 or later. Source files saved in Magic xpa V2.x are still in the old structure.
If your project was developed or was upgraded to a version prior to Magic xpa 3.1, you should update the source files before adding them to the remote repository. This can be done by selecting the Update Project Source Files entry from the Options menu.
Connecting Magic xpa with Git Repository
