Thanks, Ryan. Your understanding is correct, the file was simply replaced
(that's a project problem, not svn's) and trying to merge rev 8 didn't do
anything (as you suggested)
I feel much better now as I did merge the diff into the current file and
committed that, exactly as you suggested. I'm g
On Jan 23, 2011, at 17:32, Bill Waggoner wrote:
> 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
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
