From: Jeff King <peff@peff.net>
Date: Mon, 02 Mar 2009 04:11:13 GMT
Subject: Re: merge, keeping the remote as a new file?
Message-ID: <20090302041113.GA3094@coredump.intra.peff.net>
In-Reply-To: <81bfc67a0903011616w32ebdad9ofc096f5d1fd3174a@mail.gmail.com>

On Sun, Mar 01, 2009 at 07:16:10PM -0500, Caleb Cushing wrote:

>  I have an unmerged file... the resolution I'd like to have is
> checkout the local one for the current file name. take the remote
> version and give it a new file name. what's the best way to do that?

I would use:

  $ git show :2:file >file
  $ git show :3:file >newfile
  $ git add file newfile

You can do the first with "git checkout --ours", but I don't think there
is a way with "checkout" to say "checkout this path, but put it in a
different place".

-Peff