git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: error: failed to push some refs

From
Dmitry Potapov <dpotapov@gmail.com>
Date
Mar 7, 2010, 09:43 UTC
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
Previous: Thomas Anderson
Message 4 of 4 in “error: failed to push some refs”
  1. Thomas AndersonMar 7, 2010
  2. Shawn O. PearceMar 7, 2010
  3. Thomas AndersonMar 7, 2010
  4. Dmitry PotapovMar 7, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.