From: Kristian Amlie <kristian.amlie@trolltech•com>
To: git@vger•kernel.org
Subject: Rerunning merge on a single file
Date: Tue, 14 Oct 2008 14:13:15 +0200 [thread overview]
Message-ID: <48F48CDB.1010309@trolltech.com> (raw)
Hey, I have question about advanced merging.
Suppose I have a huge merge with conflicts all over the place. There is
no way to avoid them, so I start working from the top. At some point,
however, I make a mistake and lose the merge information for one file
(for example by checking out the file from HEAD).
In that case I would like to get the conflict markers back, and do that
file over again, but I don't want to throw away the rest of the index
state. Currently the only way I can see to do this is by checking out
several file versions under different names and then using git
merge-file on them.
Is there a better way to achieve this?
Kristian
next reply other threads:[~2008-10-14 12:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 12:13 Kristian Amlie [this message]
2008-10-14 12:21 ` Rerunning merge on a single file Santi Béjar
2008-10-14 12:28 ` Santi Béjar
2008-10-14 12:48 ` Kristian Amlie
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=48F48CDB.1010309@trolltech.com \
--to=kristian.amlie@trolltech$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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