Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-05-09 Thread Joe Cabezas
actually what are you trying to do?, the subject says something with stash, and then you talk about merging... seems like i do not undertand the problem at all... maybe when you do a stash pop, you have conflicts?, if so that is a common problem when you make a stash, actually records in

Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-11 Thread Thomas Ferris Nicolaisen
On Monday, March 11, 2013 3:55:14 AM UTC+1, David wrote: On 11/03/2013, Konstantin Khomoutov flat...@users.sourceforge.netjavascript: wrote: On Sat, 9 Mar 2013 13:52:14 -0800 (PST) Thomas Ferris Nicolaisen tfn...@gmail.com javascript: wrote: If you google the error message, my

Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-11 Thread Konstantin Khomoutov
On Mon, 11 Mar 2013 13:55:14 +1100 David bouncingc...@gmail.com wrote: If you google the error message, my explanation here is the 4th hit: http://blog.tfnico.com/2012/09/git-stash-blooper-could-not-restore.html Thanks for sharing -- this was an interesting read. Unfortunately, the

Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-11 Thread David
On 11/03/2013, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Monday, March 11, 2013 3:55:14 AM UTC+1, David wrote: On 11/03/2013, Konstantin Khomoutov flat...@users.sourceforge.netjavascript: wrote: On Sat, 9 Mar 2013 13:52:14 -0800 (PST) Thomas Ferris Nicolaisen tfn...@gmail.com

Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-10 Thread Konstantin Khomoutov
On Sat, 9 Mar 2013 13:52:14 -0800 (PST) Thomas Ferris Nicolaisen tfn...@gmail.com wrote: So, i'm doing the 'stash/pull/pop' dance that git forces me to go through when pulling changes into a modified working tree, and it has come back with a whole bunch of 'blah blah already exists, no

Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-10 Thread David
On 11/03/2013, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Sat, 9 Mar 2013 13:52:14 -0800 (PST) Thomas Ferris Nicolaisen tfn...@gmail.com wrote: If you google the error message, my explanation here is the 4th hit: