Hello,
Please do not merge resource files using SVN / manual copying files.
There is a function to Compare 2 Projects at the main screen, select 2 and right-click \ compare.
This will compare elements that are present in both projects and display those that are different (the same element exists in both projects, but has some different data).
This will not display elements that are included only in one of the projects (if you created a new element in one project, but it doesn't exist in the other, it won't be displayed), however I will add this function for next release.
Once elements are displayed, you can:
-open the new project
-and new option "Select All" will show on the "Project Comparison" window:
Once you click "Select All",
Then you can Right-click on elements on the left side, and do "Copy To Another Project"
This will replace the elements in the target project.
This does not perform synchronization (like on Esenthel Server), but just replaces destination with source files.
So if you made a change on destination project to one of the elements, it will be lost and replaced by the element from the source project.
Instead of working on 2 projects (stable and experimental), I'd rather encourage to keep all files in 1 project.
You can create a folder with the name "Experimental", and "Disable its Publishing", and create all game assets that are work in progress inside of that folder.