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 Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot