SoftDesigns:.....After cloning, editing clone, then comparing to latest skin update, let's say that we see that Skin update changes need to be merged into our cloned skin:
Do we need to "manually" merge changes from the latest Skin updates into our cloned skin?....
Yes. Once you clone a skin, any updates that come in to the original skin will need to be ported to your clone if you want to have those changes.
One point: Any changes that come in to MODULES templates that have-not been over-ridden by the skin will be automatically available to you.
So if in your skin you ARE over-riding a modules template, eg, you have a file called /skins/YOUR-SKIN/jrAudio_item_detail.tpl. then if changes come in to that module's template (/modules/jrAudio/templates/item_detail.tpl), they will need to be ported to your over-ride version if you want them.
You are using a setup similar to how I would do it, working in the file system with version control and an IDE. So I would do it like this:
* new changes come in to your system via the MARKETPLACE update system.
You want to see what has changed between this version of the original skin and the last version of the original skin, but in the file system they are in different directories, eg:
/skins/jrMediaPro
/skins/jrMediaPro-version-1.0.1
/skins/jrMediaPro-version-1.0.2
This structure doesn't work well with a revision control system because version-1.0.1 and version-1.0.2 are treated as completely different files.
If you run the REBASE MODULE tool found at:
ACP -> MODULES -> DEVELOPER -> TOOLS -> REBASE MODULES
you can stack all the revisions onto the base name directory, so version-1.0.1 and version-1.0.2 directories will disappear and you will just have:
/skins/jrMediaPro
So I would do it like this:
* use the rebase tool to remove all the versions
* sync my IDE with the server
* commit all the changes to the version control so there are no local changes present
* run the MARKETPLACE system update tool to get the new versions of the skins
* re-run the rebase tool to put the new version onto the base directory name
* sync my IDE with the server
What you should have now in your "Local Changes" panel is
just the files that have changed. you can use the compare tool built in to your revision system to see exactly what has changed. Then port those to your skin if you want them.