Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,335 views 4 5
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