Yeah I don't think there is an option to merge.
It has just prompted me saying
Quote:
"cpnav_rbs.xml" already exists in the "includes/xml/" folder. Do you want to overwrite it?
|
Is that ok to overwrite that one??
---...
edit... that seems to be the only file that already existed on the server for some reason. ??
But everything else uploaded just fine, and merged into the existing folders admincp and includes... on the server.
So I think it's just fine. It's just
that one file (cpnav_rbs.xml) that gave me a prompt to overwrite, and I said cancel... just in case...
Although it seems like it will be fine to overwrite now.
Another EDIT: I think everything uploaded fine. I had already uploaded that xml folder just to test it. On to the next step...