From: Fredrik Tolf <fredrik@dolda2000.com>
To: git@vger.kernel.org
Subject: Re: how do you "force a pull"?
Date: Sun, 26 Aug 2007 21:02:54 +0200 [thread overview]
Message-ID: <m34pimdspt.fsf@pc7.dolda2000.com> (raw)
In-Reply-To: 20070825111946.GA7122@falcon.digizenstudio.com
Jing Xue <jingxue@digizenstudio.com> writes:
> 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
next prev parent reply other threads:[~2007-08-26 19:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-25 11:19 how do you "force a pull"? Jing Xue
2007-08-25 11:31 ` 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 [this message]
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=m34pimdspt.fsf@pc7.dolda2000.com \
--to=fredrik@dolda2000.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).