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?
Is there any implementation undergoing from SourceTree Team side @Mike Corsarofor solving this merge conflicts from SourceTree itself? Similar to what GitHub Released today.
Hello! When applying a stash that causes merge conflicts, you'll need to resolve the conflicts yourself. The file list should look the same as when you have a normal merge conflict.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
That doesn't help me. I know that I need to merge conflicts. I am just asking if SourceTree wouldn't be able to help me by providing the same mechanism as when merging.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
I'm not sure what you mean. Are you requesting that ST have a new feature that allows for merging conflicts in-app?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
When I do a merge it presents me a list of conflicting files and allows me to resolve them one by one (using external merge tool). When applying a stash there is no such thing.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
I thouht I have the same issue, but then I switched back to Source Tree and the local changes were there ready to be solved and commited. Maybe it just didn't refresh the UI. Only after minimizing/switching back to Source Tree.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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.
Windows 10.
SourceTree v 2.3.1.0 (windows app version)
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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,
Kevin
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Thanks for the F5 tip @Kevin Brammer.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
The F5 tip worked for me. Thanks @Kevin Brammer
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Works for me too. Thanks @Kevin Brammer :)
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Thanks . It works @Kevin Brammer
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Had the exact same issue as described above. Solved by refreshing. Interesting that this hasn't been fixed for so long. Thanks for the help guys!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Still an issue. Is there an open issue we can vote for?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Still an issue. Refresh solved it.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.