-
Notifications
You must be signed in to change notification settings - Fork 206
Description
What area(s) will this request affect?
Deployment
What type of change do you want to see?
Substantial change to existing feature
Overview
As many people have found (see articles linked at the bottom) there are issues about running the same theme on multiple GitHub branches, for multiple stores. But that setup is a very common scenario for us devs.
The problem
The problem is simply summed up in that the theme's json files (that holds settings/customizations) will be individually altered by the integrated themes and pushed from Shopify to GitHub.
If I then push new code edits from my dev theme to the live branches, there will mostly be conflicts. Going through these conflicts individually is cumbersome, and prone to errors.
(For example: If the local json files have been altered while testing and developing, and there is no conflict, because develop is ahead of live branches — then the test settings are accidentally merged to live themes without conflict.)
The solutions suggested in the various articles come so close to an automated version, enabling us to ignore config/*json, templates/*json and locales/*json, but it doesn't quite land. I've spent hours trying to automate the flow for one client, but I reach a dead end each time I think I almost made it.
The solution
I have no specific suggestion as to how to solve it, but I first wanted to gauge the interest and see if this feature request gains some traction. And also by linking all the articles below, I want to highlight that this is an issue that many people have dived into deeply, without luck.
Maybe the solution would be something about how the Shopify GitHub integration interacts with .gitignore files. Maybe it would be something in the CLI itself. But this scenario is well worth a solution, since almost any international store benefits from this.
Conversations around this topic, which all lead to the same dead end (except maybe one very complex setup outside of the Shopify eco-system, which I have not personally tested):
- https://community.shopify.com/c/technical-q-a/multiple-stores-using-same-github-branch/m-p/1534942
- https://community.shopify.com/c/technical-q-a/online-store-2-0-multi-store-github-theme-setup/m-p/1256818
- https://serieseight.com/journal/how-to-manage-multiple-shopify-themes-with-a-single-github-repo
Motivation
Trying to maintain and develop the same theme over multiple stores, using GitHub branches, without overriding settings pushed from the Shopify GitHub integration.