Skip to content

Stash pop/apply fail should have a button for viewing conflicts

By Jake.St... on December 01, 2011 19:13 (imported from Google Code)

I find that the first thing I do after any failed pop is go to the explorer window and context to "Resolve..." so that I can view the conflicts.

Stash Pop/Apply on success have a button to view changes (which I personally never use), yet when they fail there is no button to quickly delegate to a conflict-resolution dialog. I think this would be a very helpful shortcut. :)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information