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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
