I have two different sites, a development site, and a staging site, with the same Shopify theme. I also have my theme files on git. I merge my development branch to my staging branch but I get a lot of conflicts with image paths.
For example, some CSS code will conflict
staging:background: url(//cdn.shopify.com/s/files/1/0553/6117/5731/t/44/assets/contact_bg_img.png?29198)
development:background: url(//cdn.shopify.com/s/files/1/0196/8186/9924/t/70/assets/contact_bg_img.png?36011)
The images are the same it's just that the location changes because they're different stores. If I merge the changes then the image location will be incorrect. I'm not sure how to deal with this issue. Has anyone dealt with this? Any ideas?