I successfully used the Ning code merge tool last night and all went well (that I can tell) except for the profile page. Upon redeployment of the Ning code I began receiving a fatal error error on the profile page: http://www.eprayer.org/profile/DaveThoma
When I ran the migration tool, it identified 10 files that had conflicts with the customizations from the 3.1.1 version I was on. I ended up accepting all of the "/Ning" code as opposed to the "You" code. I deployed all of the "Ning" code and this problem presented itself.
I've noticed that a new embed3welcome.php was not created by the merge tool and am wondering if that is a bug, or whether the new code no longer needs that file. Regardless, the old embed3welcome.php file is still there and is causing problems.
Has anyone run into this before? Any suggestions on how to troubleshoot? This is my first exposure to the merge tool, so I'm not sure it it's the tool or html.
I would start by making sure everything in "lib" got uploaded but specifically XG_ModuleHelper.php. Note: I have not personally used the merge tool. The individual files don't seem to have versions but mines is from bazel-3.1.8 (which has the function).