From: Santi Béjar <santi@agolina.net>
Date: Tue, 14 Oct 2008 12:21:48 GMT
Subject: Re: Rerunning merge on a single file
Message-ID: <adf1fd3d0810140521g7f43ee3bs5d4e60772bcc1d8c@mail.gmail.com>
In-Reply-To: <48F48CDB.1010309@trolltech.com>

On Tue, Oct 14, 2008 at 2:13 PM, Kristian Amlie
<kristian.amlie@trolltech.com> wrote:
> 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?

If the different versions are still in the index you could use:

$ git checkout --merge $file

Santi