Hello!
So I’ve been racking my brain and “Google” trying to find a way to merge multiple integrations into a stable source code build of UE4. (I.E Wwise integration and the new Oculus 1.3 Integration).
Is this possible to do?
I would imagine it could be done with a Git merge tool or something.
If not, then would manually locating the overlapping files and using a diff tool on them be a solution?
Thanks!
I would also like to know this. I want to merge different Gameworks into one branch. Any guide on this matter is really appreciated. Thanks 
Hello invertedJoy & ,
I can’t think of any magical way to go about doing this that would be perfect but the only thing I can suggest is doing it all through Github. If the repositories you want to merge in are all on Github, you should be able to do in a method such as this:
First, make repository that will be your Master. Make a branch off the engine version you wish to use (We’ll assume 4.10.4 in this case). Merge the changes from the branch matching your engine version from the repository you want to merge. Merge this 4.10.4 branch with your Master repository. Branch off of 4.10.4 again and repeat the merging for the next source you want to integrate. You’ll end up with plenty of discrepancies to resolve I’m sure, as some of the code might conflict each other, but that is pretty much unavoidable as far as I know.
Hope this helps!
Hey ! Thanks for the answer, I’ll definitely give that a try sometime soon.
I should probably start using github more frequently.
I was able to get a “merged” 4.10.4 running by manually copying and pasting the Oculus 4.10.4 integration over the Wwise 4.10 integration and NOT replacing files.
Then went through the Source, Plugins, Config, and Binaries folders and “diffed” the clean version of Oculus Integration against the combined one with Meld.
Making sure to double check any code that was moved over.
It was a process that took about 5-6 hours on and off.
Pretty tedious, but it built fine the first time, which left me pretty enthused.
The next Merge attempt will most likely be after the third-party integrations come out for 4.11. (normally a few weeks ).
I’ll try it using your suggestion and report back on how that goes.
Thank you so much Clark. I will try it out.