There can be conflicts when applying stash changes. Currently SourceTree just displays an error message and the conflicting files contain changes from both versions. Cannot it just apply the same mechanism as in merge conflicts?
I had the same problem: after the message there is no files listed.
I tried to minimize and resize the window, not solved.
I switched repository and return to this one and magically the file list appeared, with the the conflicted files.
SourceTree v 184.108.40.206 (windows app version)
The file status view is bugged since a few versions not refreshing and or freezing completely. I made a few bug reports on this (same as the windows size and drag an drop-ability not working) but no one seems to care.
An easy work around for your problem is to apply the stash, go to the file status tab and press F5. This will refresh the view and your conflicts will show up as usual.
Hope this Helps,
Is there any implementation undergoing from SourceTree Team side @Mike Corsarofor solving this merge conflicts from SourceTree itself? Similar to what GitHub Released today.
[Note: So it was my turn for Friday Fun and sadly I was sick thanks to rubbish sinus infection... so apologies to most of Europe and Asia for the delayed post. However, I finally got out of bed for t...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs