Corrupted conflicting asset files with git pull --rebase
I have an UE4 project with a small team and we use Git as a SCV. All *.uasset and *.umap files stores as LFS on the remote repository (GitLab). Sometimes someone of the team makes changes on a file, e.g. *.uasset, and Pushes it. On the other side someone else has made changes on the same file and Committed it. Naturally, he has to perform Pull at first and then Push. To avoid ugly addition commit "merge branch 'master' of URL into 'master'" we use command
The question is how to avoid this strange behavior?
P.S. Sorry for my bad English.
asked Apr 13 '18 at 08:42 AM in Using UE4
Hi, I am the author of the Git plugin, and sadly this is a known issue with Git LFS.
LFS is treating conflicts in a different way than raw git, and the choice they make to replace the asset by a text breaks Unreal Engine. There is nothing I can do, as far as I can tell.
The only good way to avoid the problem is to avoid conflicts altogether, which you can by using Git LFS 2 File Locks mechanism with Github, or by forbiding team members to work on the same assets at the same time using external communication tools.
answered Apr 17 '18 at 04:01 PM
Follow this question
Once you sign in you will be able to subscribe for any updates here