From: Jeff King <peff@peff.net>
Date: Mon, 02 Mar 2009 07:04:06 GMT
Subject: Re: merge, keeping the remote as a new file?
Message-ID: <20090302070406.GA12937@coredump.intra.peff.net>
In-Reply-To: <20090302065949.GD6289@atjola.homenet>

On Mon, Mar 02, 2009 at 07:59:49AM +0100, Björn Steinbrink wrote:

> Hm, how about this?
> git checkout --theirs file
> git mv file newname
> git checkout HEAD file # Can't use --ours here due to the mv

Actually, you can use --ours if you don't "git mv":

  git checkout --theirs file
  mv file newfile
  git checkout --ours file
  git add file newfile

One more command, but I think more obvious about what is going on (and I
think both are better than the other suggestions).

-Peff