Hi. Awhile ago I copied some files in my local repo then commited. In another commit I deleted the original files, so essentially I did a mv that git doesn't know about. Now I'm trying to merge from another branch where changes have happened to the files in their original locations, and it's making the merge somewhat difficult. Is there a way to ease this? -- View this message in context: http://www.nabble.com/retrospective-move-tp21826423p21826423.html Sent from the git mailing list archive at Nabble.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
