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

File Status view is stuck on a conflicted merge

I performed a merge on a branch that's now fully deleted both on my local machine and remotely, but it seems to have stuck my File Status view in a state where I can't see any of my files anymore. Instead, it's just showing a text box with the text of a conflicted merge:

2018-05-23_11-46-29.png

It stays this way after I restart SourceTree, and there's no button to clear/commit/reset/resolve conflicts/etc. The fact that it's persistent through a restart of Sourcetree makes me think that this is intended behavior, but it's not clear to me how to get out of it. Is there some way to get away from this view and back to the regular File Status view with multiple panes and views of files that have changed/are staged/etc.?

1 answer

1 accepted

9 votes
Answer accepted

OK, I figured it out. That was the commit message box, apparently, and its contents (persistent between restarts) caused it to grow to be the size of the entire pane that it was living in, pushing everything else out. I think that's a bug.

To fix, I just selected everything in that text box and deleted it.

THANK YOU.

This is one of the first times a suggested similar post that I clicked on actually solved my answer.

GO COMMUNITY!

Like # people like this

This ^^ will keep me going on submitting issues and solutions publicly on all kinds of things for the next year or so :)

Like Yonatan Lehman likes this

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