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

Re: how do you "force a pull"?

From
FTFredrik Tolf <fredrik@dolda2000.com>
Date
Aug 26, 2007, 19:02 UTC
Message-ID
<m34pimdspt.fsf@pc7.dolda2000.com>
In-Reply-To
<20070825111946.GA7122@falcon.digizenstudio.com>
Jing Xue <jingxue@digizenstudio.com> writes:
Show 8 quoted lines
> 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.

This is probably not as good an answer as David Watson's suggestion, but if what you want is to commit your current code while still having your savepoint commit in the history, shouldn't you be able to commit your current code and then use git-rebase to rebase it onto the savepoint commit?

Fredrik Tolf
Previous: Randal L. SchwartzNext: Jing Xue
Message 6 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.