Highest Hi, we have an issue with the lfs integration in sourcetree. We are working on different branches and when a new lfs file is pushed on a different branch than the current, it become impossible to merge that one.
git -c diff.mnemonicprefix=false -c core.quotepath=false merge origin/master origin/HEAD Updating 0c81946d0..ff37c34f7 Downloading resources/gfx/Game/Common/Crystal_Generator/SPR_Crystal_Ge.png (382.58 KB) Error downloading object: resources/gfx/Game/Common/Crystal_Generator/SPR_Crystal_Ge.png (2c6fd1946b07f1799ee9301be00c3d6a617a975ac19a2152c1193b5785f567c7) Errors logged to F:\wks_Inferno\Inferno\.git\lfs\objects\logs\20180328T154957.5621179.log Use `git lfs logs last` to view the log. error: external filter 'git-lfs filter-process' failed fatal: resources/gfx/Game/Common/Crystal_Generator/SPR_Crystal_Ge.png: smudge filter lfs failed Completed with errors, see above.
The problem seems to be fixed when we execute the "git lfs fetch --all" or "git lfs fetch --recent" manually in the command window.
PS: note than we used the embebbed git v2.15.1 - lfs v2.0.2
