Every time I try to merge from another branch to my branch, source tree will have a progress bar forever. I've waited over an hour for anything to happen but nothing does.
If I do it through the terminal it works fine, it's only in the gui. This happens on more than one machine as well. I believe it's getting stuck after downloading the branch but it does not get to the filtering step.
Any ideas?
Hello! I suspect file refreshing is stuck in a loop, could you try disabling auto-file refresh and try again (go to Tools > Options > General > Uncheck 'Refresh automatically when files change'). This has been fixed in the upcoming 3.0 release.
If it doesn't work after trying that, could you do the following for me?
Thanks!
Tried the above and thought it worked but again ran into a merge that did not end. Here's the log I got https://drive.google.com/file/d/1XikXO8SGKsAVBZy-HAv2ncTvt9jRKiJL/view?usp=sharing
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
I should note that using the terminal, this merge took under 5 seconds
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
What version of Sourcetree is this happening with? Is this on Windows or on the macOS?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Version 2.6.10.0. Some machines might be on a higher version than this but this would be the lowest.
Windows
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.