I’m following these steps to bring my fork up to date with Epic’s Unreal Engine repo. However immediately after checking out master, I end up with this output from git status.
modified: Engine/Source/ThirdParty/SDL2/SDL-gui-backend/build-scripts/windows-buildbot-zipper.bat modified: Engine/Source/ThirdParty/SDL2/SDL-gui-backend/build-scripts/winrtbuild.bat
I guess they are being generated from the dependency update script, or perhaps an issue with line endings?
Anyway, this is resulting in the
git merge upstream/master
command failing with
error: Your local changes to the following files would be overwritten by merge: Engine/Source/ThirdParty/SDL2/SDL-gui-backend/build-scripts/windows-buildbot-zipper.bat Engine/Source/ThirdParty/SDL2/SDL-gui-backend/build-scripts/winrtbuild.bat
Anyone know why this is happening or what the right way to proceed would be?