From: Caleb Cushing <xenoterracide@gmail.com>
Date: Mon, 02 Mar 2009 00:16:10 GMT
Subject: merge, keeping the remote as a new file?
Message-ID: <81bfc67a0903011616w32ebdad9ofc096f5d1fd3174a@mail.gmail.com>

 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?

-- 
Caleb Cushing

http://xenoterracide.blogspot.com