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 checkout', 'could not restore untracked files from stash'.
so now i'm screwed and extremely frustrated. what am i supposed to do in this situation? how do I get my work out of jail? why does git require all these gymnastics just to do a simple merge? with SVN it was 1 command, and I never had any issues with it. i don't understand. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
