SourceTree completely lags out when there is a merge conflict on a large file

[Gerald Lang]

Hello,

I have been using SourceTree for a while now, and really like it.

However, recently my project started getting larger files in it (large .prefab files from the Unity game engine) that are tracked on Git LFS, and are merged by a custom merge tool. Whenever I get a merge conflict in one of these files, SourceTree immediately becomes unresponsive due to lag, and I cannot do anything to resolve the conflict.

Does anyone have any advice on how to deal with this? Perhaps a command line workaround to run "Launch External Mergetool" from the SourceTree command line? Or perhaps a way to stop SourceTree from trying to load whatever it is loading, and just allow me to click 'Launch External Mergetool'?

Best,

Gerald

[Seth]

You might try lowering the "Max ..." and/or "Size Limit" settings in Tools > Options > Diff.