Merging during import

[Tim Morley]

Got a question about how Rosetta handles imported .po files: how  
sophisticated is the handling of differences between the imported  
file and the database? Is there anything CVS-like about it, or does  
it simply overwrite the database with the contents of the file?

The problem I've noticed is this: I downloaded ooo-writer, did a  
global search and replace one a term that we realised we'd  
mistranslated all the way through the file, then uploaded it again.  
In the meantime, apparently another team member also downloaded the  
file, did some work on it, then uploaded it back.

Will his upload destroy my work if he downloaded the same version as  
me, then uploaded his work after me? If not, how is that case handled?

Thanks in advance.


Tim