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

how do you "force a pull"?

From
JXJing Xue <jingxue@digizenstudio.com>
Date
Aug 25, 2007, 11:19 UTC
Message-ID
<20070825111946.GA7122@falcon.digizenstudio.com>
I am working in repo1, and make a savepoint commit and pack up and leave.

On another machine, I have a clone of repo1 (repo2). So I pull from repo1, "git reset --soft HEAD" to get rid of the savepoint commit, and start working in repo2.

A while later I realize the earlier commit was actually a good commit point. But I can no longer pull it again from repo1. It keeps giving me the "Cannot merge" fatal error. "-f" doesn't help.

So in general my question is "how do you force pulling from a remote repository?" (short of, you know, recloning the repo...)

I have a feeling that either I'm still stuck in the traditional central-repository mentality, or missing something real simple.

Thanks.
-- 
Jing Xue
Next: Dan Chokola
Message 1 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.