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