Brilliant. It’s working for you then? — I’ll be looking deeper asap…
We’ve just begun using it. So far it works flawlessly.
It will require some hands on action when installing a new app, to avoid conflicts (if app injects code, it will come from the theme to github affecting non-setting files, and you’re heading towards a conflict). But for code changes coming from your editor, and avoiding changing or conflicting with the settings pushed to github from the live theme, it works smooth.
1 Like
As an aside, I was planning to try another idea using github submodules (https://github.blog/2016-02-01-working-with-submodules/ 
— main repo contains theme files as usual.
— live repos linked to shopify are not branches of main, but pull submodules from main for the assets, layout, sections, and snippets directories only.
— templates, locales and config in live repo are normal directories and updated by the shopify admin as usual.
I think this submodule setup would have the same app conflict issue you described above (git commands on submodule directories are ignored so shopify should not be able to alter anything in them).
I’m not sure if this would be a wise or practical (or even functional — can you pull a directory as a submodule, or only the entire repo?) method, but perhaps another possibility…
So I’m revisiting this just now, and struggling to get this straight. Might just be too early on a Monday! The action has a from_branch parameter and a single to_branch parameter — which seems to work as expected for main > live_A, but I’m not sure what the action setup should be for multiple branches? e.g.
main — live_A
— live_B
— live_C
Hi Matthew,
Might be worth while looking at this one? - https://apps.shopify.com/themeflow