From: Dmitry Potapov <dpotapov@gmail.com>
To: Thomas Anderson <zelnaga@gmail.com>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: Re: error: failed to push some refs
Date: Sun, 7 Mar 2010 12:43:20 +0300 [thread overview]
Message-ID: <20100307094320.GD31105@dpotapov.dyndns.org> (raw)
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
prev parent reply other threads:[~2010-03-07 9:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-07 2:15 error: failed to push some refs Thomas Anderson
2010-03-07 2:18 ` Shawn O. Pearce
2010-03-07 5:04 ` Thomas Anderson
2010-03-07 9:43 ` Dmitry Potapov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100307094320.GD31105@dpotapov.dyndns.org \
--to=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
--cc=zelnaga@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).