Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
Community Members
Community Events
Community Groups

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:


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.


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


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
AUG Leaders

Atlassian Community Events