Git: Upgrading osCommerce

Change to the working directory and checkout the dev branch.

$ cd ~/source/web-store
$ git checkout dev

Download the appropriate update file from http://www.oscommerce.com/Products and unzip it.

$ cd ~/Downloads/osCommerce
$ unzip oscommerce-2.3.3.2-to-2.3.3.3.zip

Rename admin to lim_admin and copy the files over to the working directory.

$ cd oscommerce-2.3.3.2-to-2.3.3.3
$ catalog/
$ mv admin/ lim_admin
$ cp -R * ~/source/web-store/

Change back to the working directory and update the git repo.

$ cd ~/source/web-store
$ git add -A
$ git commit -m "Updating to version 2.3.3.3"

Create branch for the release.

$ git checkout -b release-2.3.3.3

FTP the new/updated files to the webserver and test. Make any needed changes to the release branch. Once working and happy, merge changes back into “master.”

$ git checkout master
$ git merge --no-ff release-2.3.3.3
$ git tag -a 2.3.3.3
$ git send

If there were changes to the release branch, merger them back into the dev branch.

$ git checkout dev
$ git merge --no-ff release-2.3.3.3
$ git send

…and all finished.