I have a fork of Unreal I made in 4.15, and now I want to update it to 4.16.
I’ve tried the regular fork update process:
git remote add upstream https://github.com/EpicGames/UnrealEngine.git git fetch upstream git merge upstream/4.16
This failed because some file existed that I didn’t create in emscripten, so I deleted it.
Now I have a huge merge list, and no way to just say “Accept all changes”…?
What’s the easiest way to just get the latest version? I have some changes I’ve made to the engine but they’re hidden in with 16000 other additions/changes… How can I merge easily?