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

Ok, I remember reading that. But it's not helpful because its not really 

Firstly, if you just do a 'git pull' you're likely to run into conflicts which 
require an alternative route. At that point I begrudgingly try a 
'stash/pull/pop' but that doesn't work either in general due to conflicts with 
untracked files, so then I have to do whatever voodoo you suggested above.

My question is this: given that I have local changes, and given that the branch 
I have has changes that conflict in all those ways, what's the simplest 
possible way for me to merge those changes, conflicts and all, into my tree? 

And if that's not a single command, might I suggest that it should be?

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