git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jing Xue <jingxue@digizenstudio.com>
To: git <git@vger.kernel.org>
Subject: how do you "force a pull"?
Date: Sat, 25 Aug 2007 07:19:46 -0400	[thread overview]
Message-ID: <20070825111946.GA7122@falcon.digizenstudio.com> (raw)

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

             reply	other threads:[~2007-08-25 11:20 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-25 11:19 Jing Xue [this message]
2007-08-25 11:31 ` how do you "force a pull"? Dan Chokola
2007-08-25 11:37 ` David Watson
2007-08-25 11:53   ` Jing Xue
2007-08-25 13:19     ` Randal L. Schwartz
2007-08-26 19:02 ` Fredrik Tolf
2007-08-27  5:26   ` Jing Xue

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=20070825111946.GA7122@falcon.digizenstudio.com \
    --to=jingxue@digizenstudio.com \
    --cc=git@vger.kernel.org \
    /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).