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 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 out of the way first, just so i can bring them in later. if
there's
going to be a conflict, why not let 'merge' or 'pull' give it to me,
why
make me have to jump through all these extra hoops (stash, stash
branch,
reset, cherry-pick, etc...) just to get back to the same place.

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` manual:

 Warning: Running git merge with uncommitted changes is discouraged:
 while possible, it leaves you in a state that is hard to back out of
in
 the case of a conflict.

So, if you don't want to take this warning or think it does not apply
to you, just `git pull` to a dirty tree.


Looks like it might be useful setting one of the config advice.* :-
"   commitBeforeMerge
Advice shown when git-merge(1) refuses to merge to avoid overwriting
local changes."

may be relevant here.

I haven't checked what it says (which may be the existing OP message),
but I'm hoping it maybe that it 'stop's before starting the dirty
merge'.

There are also a lot of merge.* config flags available as well. One of
which may also be able to cause the 'stop's before starting the dirty
merge'.

It would surprise me if there wasn't, but then Git's full of surprises.

At the moment my git-merge man page, under 'pre-merge checks', says:

"git pull and git merge will stop without doing anything when local
uncommitted changes overlap with files that git pull/git merge may need
to update."

So I'm not quite sure how that fit's with the original problem report.

Philip

--
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.


Reply via email to