I’m trying to integrate VXGI, HBAO+, HairWorks and FleX into unreal.
So I cloned the source from GitHub.
Then go to release branch. Merge with VXGI-4.13 branch (git merge origin/VXGI-4.13), no conflicts.
Then merge with origin/HBAO+ (git merge origin/HBAO+), it says it is up to date.
Then merge with FleX (git merge origin/FleX)
Then the conflicts appear. Is is a normal happening if we merge multiple game works into unreal engine?
Is there a way to solve conflicts by ourselves?
Am I doing it in the right way?
**I’m very new to Unreal Source and using Git. I’m trying to understand them. I’ve never done such process in my life before.
So please help me if you know the solution or if there are any piece of advice.**