It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Source Tree freezes when merging

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?

2 answers

0 votes
Manju Atlassian Team Aug 22, 2018

What version of Sourcetree is this happening with? Is this on Windows or on the macOS?

Version 2.6.10.0. Some machines might be on a higher version than this but this would be the lowest.

Windows

0 votes
Mike Corsaro Atlassian Team Aug 27, 2018

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?

  • Open the Process Viewer by going to "Tools > Process Viewer"
  • Try the merge again, and observe what happens in the viewer (I suspect you'll see a ton of processes running)
  • If there's a single process that seems to be running forever then save the log or screenshot it so that I can see the details of the 'Caller Context' and 'Command" columns

 

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

I should note that using the terminal, this merge took under 5 seconds

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,902 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you