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:
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.?
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.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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