Merge confusion ...

This is a confused newbie question about merge. I'll try to be brief ...

I have a script, index.php, that I updated at R8 to add some code. We are
now at R13 or so ... Someone else, outside of SVN, updated the source file
with changes that did not include my changes at R8. Now I have a copy of
their updated file, how (or can I?) use MERGE to take my changes (7:8) and
insert them into the new source? The changes are not in conflict at all.

TIA,
Bill W
Received on 2011-01-24 00:33:12 CET