I will do some modification, etc. Will it be easy to upgrade to future theme releases? ( for versions below 1.5 )
ALWAYS DO BACKUP BEFORE UPDATING THEME. After theme update is uploaded and cache refreshed - please go to theme Settings and press Save to update configuration - we often adding new options and they need to appear in DB
I. If you have NOT changed any files
You can just copy files from new package over old files. Thats it! Theme is updated. You can just refresh cache and flush css/js ( if you use merge option ).
II. If you have changed theme files
If you not familiar with git or console you ca use a file and folder comparison software. If that sounds frightening, don't worry. There's plenty of software and web apps that do that out there. Many of them are free and most of them offer a free trial. For example You can try Beyond Compare.. Merge changes from latest update in your files and upload it.
For those who do use git
1. To apply update you need to use command line ( console ) on your server.
You can use some of the free console clients, i.e. "putty".
2.Login to your server and find magento root folder. If you are not sure about root folder,
but you have ftp access, then you can try to create one line php file and upload it via ftp.
File should contain following line of code
Note: Patches should be applied version by version. I.e. if you have v1.2, you should not
apply patches from v1.2.3 before you applied patches for v1.2.1 and v1.2.2
4. Run patch files one by one with help of git apply command:
5.When git apply is working normallyand all goes well, you will not receive any response at all:
5.1. If you want to see what's going on behind the scenes, you can use the -v (verbose) flag:
6. Here is the other output that git apply command can generate, and what it means.
Patch does not apply
Git couldn't apply the changes in the patch because it wasn't able to find the line(s)
of code in question; they must have been changed or removed by another commit.
1Make sure the patch hasn't already been applied. Try to examine the code to see if
the change(s) are already present. If they are, you're done.
If they aren't or if only some of them are, try something else:
Use patch -p1 < filename.patch. Whereas git-apply altogether rejects a
patch with any errors, patch -p1 works hunk by hunk, applying as many
individual changes as it can. It backs up each file as filename.ext.orig before
modifying it and saves rejected hunks in filename.ext.rej. Discard the .orig files
and manually apply the changes left in the .rej. This is an easy strategy for small
7. Lets take a look at patch file content.
skin/frontend/default/shopper/css/local.css | 3 ++-
This code means that local.css was changed, 3 differences, 2 insertion, 1 deletion
line with minus was deleted
line with plus was added