I am having troubles rebasing my engine commits on the 4.15 branch. While figuring out what is wrong I noticed that on Epic’s repository currently there are both IOS and iOS folders inside Engine/Source/Runtime/Core/Public/.
Looks like since Windows does not distinguish case in folder names, it just creates one IOS folder and puts in it also the content of iOS. Git detects this as mofications and “reset --hard” does not fix it. I am using Github’s Git Shell as client.