rabellogp
March 2, 2015, 1:43pm
601
I think said further up that one doesn’t need to merge HBAO+ to the VXGI as VXGI has its voxel AO or stuff.
The merge errors are easy though, they aren’t real conflicts but git doesn’t know if its right to keep the changes from both branches.
So edit the files with conflict and remove the <<<<<<, ======= and >>>>>> messages until it looks reasonable again (think while you do) and then ‘git add’ the changed file, after you done all files ‘git commit’ will complete the merge.
Yeah I just want to mess around with the combination a little bit to see what kind of graphical results I could achieve… I’ll try to edit the files like you said, thanks! =)
It’s not hard at all. Just download the github windows client, clone the release and you don’t even need to use a console to manage the branches. But I think it’s even easier with the console, just right click on your clone inside github windows client, choose “Open in Git Shell” and follow these instructions:
You should be able to merge the branches into a single branch (for example, called ‘AllFeatures’). You would do:
*git checkout release *(switch to standard 4.6.1 release branch)
*git branch AllFeatures *(make a new branch from it)
*git checkout AllFeatures *(switch to the new branch)
*git merge Flex *(merge all the changes from the Flex branch, which should work fine because the FleX branch started out as the release branch)
compile the AllFeatures branch to make sure the merge worked OK.
*git merge WaveWorks *(merge all the changes from the WaveWorks branch, the WaveWorks branch also started out as the release branch)
Then you would try to compile the combined branch. is what I intend to do when we get the VXGI, HairWorks, TurfEffects, etc., up and running.
Why not, clone it from my github repo /eAlex79/UnrealEngine/tree/4.6-integrating and checkout branch 4.6-integrating, it contains the substance plugin and the nv branches. Don’t overwrite files when setup.cmd downloads dependencies.
Though I dont guarantee I did it right, that it works at all, and I don’t support it. If you computer blows, I didnt do it
And the branch will not be there forever.
thanks for that! I’ll give it a try =D