Specific to merging two copies of the same project that have been accidentally edited independently, here is an extended how-to on a couple of different techniques.
Specific to merging two copies of the same project that have been accidentally edited independently, here is an extended how-to on a couple of different techniques.