Shopify Contract Work Tools & Processes

General Procedures

1. Always work in a git repo. The first step in doing ANY work is ALWAYS:
2. create a git repo for the site
3. use this bundle to download the template.
4. git ci -m "Initial import of template"
5. Inform the shop owner that our process uses version control, and that the procedures we follow minimize the danger of different people overwriting each others work, and that we need to be informed of any installation or uninstallation of plugins or apps, because they can edit template files automatically.
6. DON'T use watchr on live sites, or sites where third-parties including the shop owner are working. Uploading a file should be a conscious explicit action, followed by immediate verification the upload has not broken the site

Merging online changes

The online site should be considered the "upstream". Template changes can occur from edits by the site owner, by a third-party contractor, or automatically by plugins or applications that the owner installs/uninstalls.

• git co -b merge_with_online
• use bundle to download template
• git diff
• inspect changes and fix anywhere where someone else clobbered our work
• upload any files changed in previous step, check online for problems
• git ci -m "merged with online changes — [[describe what was changed by third-party]]"
• git co master
• git merge merge_with_online
• git push