Merging them isn’t actually too hard. I actually recommend doing it manually, though. It can be error-prone, but it’s the most long-term manageable way I’ve been able to reconcile issues that crop up while noticing an issue in the context of a change being made (because NVIDIA’s integrations are not perfect) that a merge never would have clued me in on.
Almost every single change in an integration can be found by just searching the solution for whatever the integration’s keyword is, like the volumetric lighting is:
// NVCHANGE_BEGIN: Nvidia Volumetric Lighting
Or (though this isn’t 100% reliable):
It can take about an hour or two to do manually, but it’s the best approach I’ve found. And just so you know what kind of custom fork I’m working with: https://joy-machine.com/joy-engine