Are there any good learning resources for Git you happen to know of? Whenever I want to merge two Git branches, I’ve always just been using WinMerge to find the differences in each file and manually copy stuff over in hopes nothing breaks. Not exactly the best option out there.
And out of curiosity, is there any risk in using the merged branch for a long term project (as in a year or longer)? It’ll probably be fine, I’m just worried about what might happen if for any reason you don’t keep up with later engine builds and I end up using a branch that doesn’t have every single tech integrated in the engine. That’s the main reason I’ve stuck to just the VXGI build this entire time.