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

Re: how do you "force a pull"?

From
JXJing Xue <jingxue@digizenstudio.com>
Date
Aug 25, 2007, 11:53 UTC
Message-ID
<20070825115326.GB7122@falcon.digizenstudio.com>
In-Reply-To
<20070825113747.GA21030@mimvista.com>
On Sat, Aug 25, 2007 at 07:37:47AM -0400, David Watson wrote:
> $ git reset --hard origin/master

Ah, this is what I was looking for. Not very intuitive, but works like a charm!

> You may be getting the "cannot merge message" if you have uncommitted
> changes, as git won't let you merge when the working copy is changed.
> git-pull is really git-fetch + git-merge.
Right, because I used "--soft" in the earlier reset.
Thanks!
-- 
Jing Xue
Previous: David WatsonNext: Randal L. Schwartz
Message 4 of 7 in “how do you "force a pull"?”
  1. Jing XueAug 25, 2007
  2. Dan ChokolaAug 25, 2007
  3. David WatsonAug 25, 2007
  4. Jing XueAug 25, 2007
  5. Randal L. SchwartzAug 25, 2007
  6. Fredrik TolfAug 26, 2007
  7. Jing XueAug 27, 2007

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.