From: Dmitry Potapov <dpotapov@gmail.com>
Date: Sun, 07 Mar 2010 09:43:20 GMT
Subject: Re: error: failed to push some refs
Message-ID: <20100307094320.GD31105@dpotapov.dyndns.org>
In-Reply-To: <15b345f1003062104p67edcde9pba7cf6000d4d7a2c@mail.gmail.com>

On Sat, Mar 06, 2010 at 11:04:03PM -0600, Thomas Anderson wrote:
> 
> How do I do "git pull" with Git Gui?

I don't know much about Git Gui, but "git pull" is an equivalent of
"git fetch" and "git merge", and it seems Git Gui got both Fetch
and Merge in its menu...

> And in any event, if there's a
> conflict, I wouldn't want to overwrite my code with the code on the
> server - I'd want to view a diff so that I might resolve the conflict
> by hand.

"git pull" (or "git merge") will produce this conflict in your working
tree, which you should resolve then and commit. (Git automatically
creates a merge commit if there was no conflicts.)


Dmitry