Tukukkk

I am building a large front-end application that is effectively an authoring tool for specific slide-shows.

A developer needs to be able to create a new branch for a new slide-show, make changes, and merge those changes for future use back into the master project.

This work-flow is working well except for the fact that each slide-show uses seperate config.json files and seperate media assets. This means that when merging back into master, there's a convoluted step where you have deal with not merging the assets, but merging everything else.

Now normally I would exclude the /assets/ folder from git entirely, but those assets need to be pulled in somehow. My question is, what is the best way to handle switching out all media assets and config files per branch?

I was thinking of going the route of having the assets be contained in their own submodule, that a deploy step could handle switching with the correct submodule, but I've heard many drawbacks to that approach.

Should I load the assets into an s3 bucket and use a CDN?

Any advice on how to handle the swapping out of large media assets would be helpful.

TLDR: I want to swap out media assets when I switch branches in as simple a build step as possible. I have a core module that I want to be able to update without worrying about merging the media assets.