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'?
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG