Open SRombauts opened 6 years ago
How to solve a merge conflict:
@brusiks said in #48 Git LFS conflict resolution not working:
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.
This is caused by the default merge driver for git lfs, it can be easily fixed by changing the merge driver to the git's default for binary files.
So, in a typical .gitattributes
file we would have the entry for .uasset
files similar to:
*.uasset filter=lfs diff=lfs merge=lfs -text
We change the merge driver to binary
like so:
*.uasset filter=lfs diff=lfs merge=binary -text
That will make git choose the current version of the conflicting file (ref) and which will allow UE4 merge tool to work correctly.
We could improve the plugin in two ways:
What do you think?
I will try to implement at least the first one.
Yes, very good to know indeed, thank you!
Answerhub Git LFS Conflict Resolution
Does the git plugin works for conflicts on Blueprints tracked by Git LFS?