Shopify theme for spinellikilcollin.com
Development Guidelines:
Master Branch
The master branch should reflect the current state of the live site. All CSS changes should be checked with Backstop on the development branch before pushing.
Development Branch
All work in progress should be done on the development branch, or off of child branches of development.
Install themekit and theme watch to upload changes. Given the current config.yml, theme watch will upload to the Testament - Development theme, which can be previewed via the Shopify admin.
Visual Diffing
Install Backstop: npm install -g backstopjs
Before starting your work, run backstop reference. If you forget to do this before you start working, just git stash, backstop reference, and git stash apply. After making your changes, run backstop test. The "Failed" tests will show the diffs in any screen captures. These should reflect the changes you intend to make -- look through them to make sure there were no changes you did not intend to make.
Hotfixes
Hotfixes should be completed on the master branch, then merged into develop. It's best here to not use theme watch, because if you forget to disable it before switching back to develop, all of the changed files in that branch will be pushed. Rather, manually upload any changes you've made.
Example:
git checkout master- [make quick fix to menu UX]
git statusto see what files you have changedtheme upload -e production file1 file2git commit -m "Burger menu hotfix resolves #12"git checkout developmentgit merge master