Git LFS conflict resolution not working

SRombauts / UEGitPlugin

Unreal Engine 5 Git LFS 2 Source Control Plugin (beta)

http://srombauts.github.io/UEGitPlugin

MIT License

808 stars 165 forks source link

Git LFS conflict resolution not working #48

Closed brusiks closed 6 years ago

brusiks commented 6 years ago

Unreal Engine can't read uasset file if it is in a conflict state after merging branches. Because of GIT LFS there is not binary content of the uasset files and resolving of the conflict is not possible.

SRombauts commented 6 years ago

Sorry, in fact I've already created an issue for this problem (#47) so I am closing this one