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 -- 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