Once VXGI exists, the two branches VXGI and FleX should merge cleanly. I will probably try it myself before publishing the VXGI branch (which unfortunately is delayed a bit, and probably won’t be ready for at least another week). To do it, I would make another branch from one of them, e.g. “git branch FleX FleXVXGI”, which will create the branch, then “git checkout FleXVXGI” to set it as your working branch; then do a “git merge VXGI” to bring the VXGI changes across. Because all branches of the fork are on the same base UE4 (4.6.1 currently), it should merge fine. That’s the theory, anyways.
And yes, we will update the fork to 4.7 when that release is formally complete. It might take us a few days to turn it around, but the plan is to always keep fork in synch with latest UE4.