sublime_merge
sublime_merge copied to clipboard
Dangling Requests
Problem description Context - I am not the best with git; sublime merge makes it much easier for me to use it effectively. The other day I accidentally bumped ctrl+s out of coding habit, and it caused me to stash. I then accidentally popped the stash and pushed. All the work in the stash was gone, about 3 days' worth of work. I panicked... ended up calling a coworker and doing some googling to find out I could run some console commands to fetch a list of all dangling commits and their commit hashes. From there, I could check the time stamps of those hashes with different commands to figure out which one was the one I accidentally lost. Finaly I was able to restore my work once I got the proper commit hash of the lost stash.
Preferred solution Add an option to the Git Graph visualization that shows dangling commits. This would have allowed me to toggle this option, see my stash, and apply it properly with just a couple of clicks and would have minimized my freak-out.
Alternatives Console commands as posted in the original problem description above, which is annoying and requires me to close Sublime merge to prevent any issues.
related: #21, #547, #1362