From: Johannes Sixt <j.sixt@viscovery.net>
To: Chris Packham <judge.packham@gmail.com>
Cc: Jakub Narebski <jnareb@gmail.com>, GIT <git@vger.kernel.org>
Subject: Re: re-running merge on a single file
Date: Fri, 12 Mar 2010 07:45:29 +0100 [thread overview]
Message-ID: <4B99E309.2070603@viscovery.net> (raw)
In-Reply-To: <a038bef51003111633v5d5d418bu332b63bb3874e3ef@mail.gmail.com>
Chris Packham schrieb:
> $ git checkout --merge -- cpu/mpc83xx/start.S
> $ git show :1:$(git rev-parse --show-prefix)cpu/mpc83xx/start.S
> fatal: Path 'cpu/mpc83xx/start.S' is in the index, but not at stage 1.
> Did you mean ':0:cpu/mpc83xx/start.S'?
Both of these work only as long as the index still records the conflicted
state. If you (or one of your tools) has git-added the file, or you have
git-checked-out some version of the file, the conflict stages are lost,
and you must reset --hard and redo the entire merge.
-- Hannes
next prev parent reply other threads:[~2010-03-12 6:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 18:54 re-running merge on a single file Chris Packham
2010-03-11 19:09 ` Chris Packham
2010-03-11 20:29 ` Markus Heidelberg
2010-03-11 22:08 ` Chris Packham
2010-03-11 23:20 ` Jakub Narebski
[not found] ` <a038bef51003111631n38f7e50cp79d8335109f3ed0@mail.gmail.com>
2010-03-12 0:33 ` Chris Packham
2010-03-12 6:45 ` Johannes Sixt [this message]
2010-03-12 6:56 ` Junio C Hamano
2010-03-12 20:16 ` Chris Packham
2010-03-12 21:16 ` Chris Packham
2010-03-12 23:07 ` Junio C Hamano
2010-03-12 23:43 ` Chris Packham
2010-03-14 12:24 ` Kris Shannon
2010-03-12 9:00 ` Jakub Narebski
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=4B99E309.2070603@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=judge.packham@gmail.com \
/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).