resolve conflict in .uasset files always I got 0 bytes file

[robreto45]

When I try to resolve conflict in .uasset files (unreal engine files) and I choose other or our, gitfiend always replaces it by 0 bytes file, in 0.44.3 and previous versions

[GitFiend]

Thanks for reporting this. I'll have a look at it.