So I'm an artist on a midsize project that is wrapping up and we are currently doing a lot of ports. We are building for a variety on consoles and platforms, while at the same time fixing issues on our main development branch. The problem that we are running into is while most bugfixes and changes from the main should be able to be pulled to these port build branches, a few files and assets on them are different (for example, lighting is handled differently on mobile vs. pc. and the lighting prefabs used in the scenes are different) How can I make it so certain files are able to be committed within a branch, but are never overwritten by changes on the main branch? (We merge to the port forks frequently, but never back to dev)
Do we have to sort out conflicts manually, or is there a way to make it always choose destination changes in the case of these files?
