Problem merging file sent by collaborator

Hi,

I'm in a pickle, hopefully someone can help. I'm working on a project with a
friend, who's been having problems with his SVN client (not Tortoise.) In
exasperation, he's just emailed me the updated version of the document. In
the meantime, I've also made changes to the document (I'm using Tortoise.)
So, I need to merge his changes into my version, which is nontrivial since
we've edited the same document in different ways in different places.

I just can't see how to accomplish this, although it should be trivial for
TortoiseMerge. If I copy his version into my working directory, temporarily
overwriting my version of the file (I've kept a safe copy) and select "Diff
from previous version" from the TortoiseSVN menu, I get TortoiseMerge coming
up with my version on the left and his version on the right. But it's not
making any effort to combine our edits, and there's no third 'merge' window
at the bottom, showing the result of combining our edits.

Any ideas?

Cheers,
Jamie.

-- 
View this message in context: http://old.nabble.com/Problem-merging-file-sent-by-collaborator-tp31645280p31645280.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2740178
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].