A space to discuss online store customization, theme development, and Liquid templating.
Hello, I am using Dawn for my ecommerce.
I would like to share some considerations with you: I cloned version 2.4.0 from Github and started modifying it according to my needs.
I want to be constantly updated with the latest community-developed versions of Dawn, so periodically I pull from the upstream repository.
When I pull logically my changes conflict with the upstream and so I have to manually resolve the conflicts.
The biggest problem is handling conflicts in the settings_data.json and settings_schema.json files.
How do you manage these situations?