For a few hours, one of my teammate and I wondered why our stuff get overwritten when we merge to our files together but no conflict error was raised. After that, I have found out that during a merge, UAssets are passed as a module, so changes within the file are undetectable by Git. So Git would everything is fine and completely overwrite the old files with the new ones.
After discussing with the team, we have decided to list down all the changed files in the commit message body to alert the others about what has been changed. The retrievers would have to hand copy all the logics within the listed files and then overwrite them safely.
Comments