Re: [git-users] Re: git merge: error: The following untracked working tree files would be overwritten by merge

2013-03-09 Thread Konstantin Khomoutov
On Fri, Mar 08, 2013 at 03:56:42PM -0800, Johan 't Hart wrote: My guess is that it has just always behaved that way, and changing it now would surprise too many users. Personally I would find it very disturbing if merge started modifying my index (the only commands that should modify

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

2013-03-09 Thread Konstantin Khomoutov
On Fri, Mar 08, 2013 at 06:03:34PM -0800, Piers H wrote: [...] i seriously don't understand why it's so hard to do this seemingly simple thing - bring me up-to-date. i just want it to get the changes, merge them in and show me the conflicts. i don't know why i have to push my local changes

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

2013-03-09 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net To: git-users@googlegroups.com Sent: Saturday, March 09, 2013 11:02 AM Subject: Re: [git-users] HELP! stash pop is failing and I can't get my work out On Fri, Mar 08, 2013 at 06:03:34PM -0800, Piers H wrote: [...] i seriously don't

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

2013-03-09 Thread Piers Haken
On Mar 9, 2013, at 3:02 AM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Fri, Mar 08, 2013 at 06:03:34PM -0800, Piers H wrote: i must be missing something, but i just don't see it. what is that SVN is doing wrong by making this so simple? Let's cite the `git merge`

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

2013-03-09 Thread Thomas Ferris Nicolaisen
On Friday, March 8, 2013 10:06:04 PM UTC+1, Piers H 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 checkout', 'could not restore